wip

2025-08-04 18:12:32 +01:00 · 2025-08-04 12:00:35 +01:00
136 changed files with 1730 additions and 2604 deletions
--- a/.github/.nvmrc
+++ b/.github/.nvmrc
@@ -1 +1 @@
-22.18.0
+22.17.1
--- a/.github/workflows/close-duplicates.yml
+++ b/.github/workflows/close-duplicates.yml
@@ -1,96 +0,0 @@
-on:
-  issues:
-    types: [opened]
-  discussion:
-    types: [created]
-
-name: Close likely duplicates
-permissions: {}
-
-jobs:
-  get_body:
-    runs-on: ubuntu-latest
-    env:
-      EVENT: ${{ toJSON(github.event) }}
-    outputs:
-      body: ${{ steps.get_body.outputs.body }}
-    steps:
-      - id: get_body
-        run: |
-          BODY=$(echo """$EVENT""" | jq -r '.issue // .discussion | .body' | base64 -w 0)
-          echo "body=$BODY" >> $GITHUB_OUTPUT
-
-  get_checkbox_json:
-    runs-on: ubuntu-latest
-    needs: get_body
-    container:
-      image: yshavit/mdq:0.7.2
-    outputs:
-      json: ${{ steps.get_checkbox.outputs.json }}
-    steps:
-      - id: get_checkbox
-        env:
-          BODY: ${{ needs.get_body.outputs.body }}
-        run: |
-          JSON=$(echo "$BODY" | base64 -d | /mdq --output json '# I have searched | - [?] Yes')
-          echo "json=$JSON" >> $GITHUB_OUTPUT
-
-  close_and_comment:
-    runs-on: ubuntu-latest
-    needs: get_checkbox_json
-    if: ${{ !fromJSON(needs.get_checkbox_json.outputs.json).items[0].list[0].checked }}
-    permissions:
-      issues: write
-      discussions: write
-    steps:
-      - name: Close issue
-        if: ${{ github.event_name == 'issues' }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-          NODE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          gh api graphql \
-            -f issueId="$NODE_ID" \
-            -f body="This issue has automatically been closed as it is likely a duplicate. We get a lot of duplicate threads each day, which is why we ask you in the template to confirm that you searched for duplicates before opening one." \
-            -f query='
-              mutation CommentAndCloseIssue($issueId: ID!, $body: String!) {
-                addComment(input: {
-                  subjectId: $issueId, 
-                  body: $body
-                }) {
-                  __typename
-                }
-              
-                closeIssue(input: {
-                  issueId: $issueId,
-                  stateReason: DUPLICATE
-                }) {
-                  __typename
-                }
-              }'
-
-      - name: Close discussion
-        if: ${{ github.event_name == 'discussion' && github.event.discussion.category.name == 'Feature Request' }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-          NODE_ID: ${{ github.event.discussion.node_id }}
-        run: |
-          gh api graphql \
-            -f discussionId="$NODE_ID" \
-            -f body="This discussion has automatically been closed as it is likely a duplicate. We get a lot of duplicate threads each day, which is why we ask you in the template to confirm that you searched for duplicates before opening one." \
-            -f query='
-              mutation CommentAndCloseDiscussion($discussionId: ID!, $body: String!) {
-                addDiscussionComment(input: {
-                  discussionId: $discussionId,
-                  body: $body
-                }) {
-                  __typename
-                }
-              
-                closeDiscussion(input: {
-                  discussionId: $discussionId,
-                  reason: DUPLICATE
-                }) {
-                  __typename
-                }
-              }'
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,7 +50,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,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@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/autobuild@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4

      # ℹ️ 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
@@ -76,6 +76,6 @@ jobs:
      #   ./location_of_script_within_repo/buildscript.sh

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
        with:
          category: '/language:${{matrix.language}}'
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -129,7 +129,7 @@ jobs:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
        with:
          sarif_file: results.sarif
          category: zizmor
--- a/cli/.nvmrc
+++ b/cli/.nvmrc
@@ -1 +1 @@
-22.18.0
+22.17.1
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@immich/cli",
-  "version": "2.2.77",
+  "version": "2.2.76",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@immich/cli",
-      "version": "2.2.77",
+      "version": "2.2.76",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "chokidar": "^4.0.3",
@@ -27,7 +27,7 @@
        "@types/lodash-es": "^4.17.12",
        "@types/micromatch": "^4.0.9",
        "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.17.0",
+        "@types/node": "^22.16.5",
        "@vitest/coverage-v8": "^3.0.0",
        "byte-size": "^9.0.0",
        "cli-progress": "^3.12.0",
@@ -35,7 +35,7 @@
        "eslint": "^9.14.0",
        "eslint-config-prettier": "^10.1.8",
        "eslint-plugin-prettier": "^5.1.3",
-        "eslint-plugin-unicorn": "^60.0.0",
+        "eslint-plugin-unicorn": "^59.0.0",
        "globals": "^16.0.0",
        "mock-fs": "^5.2.0",
        "prettier": "^3.2.5",
@@ -54,14 +54,14 @@
    },
    "../open-api/typescript-sdk": {
      "name": "@immich/sdk",
-      "version": "1.137.3",
+      "version": "1.137.2",
      "dev": true,
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@oazapfts/runtime": "^1.0.2"
      },
      "devDependencies": {
-        "@types/node": "^22.17.0",
+        "@types/node": "^22.16.5",
        "typescript": "^5.3.3"
      }
    },
@@ -90,9 +90,9 @@
      }
    },
    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -632,9 +632,9 @@
      }
    },
    "node_modules/@eslint/core": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
+      "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
@@ -682,9 +682,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.32.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.32.0.tgz",
-      "integrity": "sha512-BBpRFZK3eX6uMLKz8WxFOBIFFcGFJ/g8XuwjTHCqHROSIsopI+ddn/d5Cfh36+7+e5edVS8dbSHnBNhrLEX0zg==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
+      "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -705,13 +705,13 @@
      }
    },
    "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.4.tgz",
-      "integrity": "sha512-Ul5l+lHEcw3L5+k8POx6r74mxEYKG5kOb6Xpy2gCRW6zweT6TEhAf8vhxGgjhqrd/VO/Dirhsb+1hNpD1ue9hw==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
+      "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@eslint/core": "^0.15.1",
+        "@eslint/core": "^0.14.0",
        "levn": "^0.4.1"
      },
      "engines": {
@@ -1355,9 +1355,9 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "22.17.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.0.tgz",
-      "integrity": "sha512-bbAKTCqX5aNVryi7qXVMi+OkB3w/OyblodicMbvE38blyAz7GxXf6XYhklokijuPwwVg9sDLKRxt0ZHXQwZVfQ==",
+      "version": "22.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.16.5.tgz",
+      "integrity": "sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1897,9 +1897,9 @@
      }
    },
    "node_modules/browserslist": {
-      "version": "4.25.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
-      "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
      "dev": true,
      "funding": [
        {
@@ -1917,10 +1917,10 @@
      ],
      "license": "MIT",
      "dependencies": {
-        "caniuse-lite": "^1.0.30001726",
-        "electron-to-chromium": "^1.5.173",
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
+        "update-browserslist-db": "^1.1.1"
      },
      "bin": {
        "browserslist": "cli.js"
@@ -1981,9 +1981,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001731",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001731.tgz",
-      "integrity": "sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==",
+      "version": "1.0.30001713",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz",
+      "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
      "dev": true,
      "funding": [
        {
@@ -2035,13 +2035,6 @@
        "url": "https://github.com/chalk/chalk?sponsor=1"
      }
    },
-    "node_modules/change-case": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
-      "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/check-error": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
@@ -2068,9 +2061,9 @@
      }
    },
    "node_modules/ci-info": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-      "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz",
+      "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==",
      "dev": true,
      "funding": [
        {
@@ -2157,13 +2150,13 @@
      "license": "MIT"
    },
    "node_modules/core-js-compat": {
-      "version": "3.45.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.0.tgz",
-      "integrity": "sha512-gRoVMBawZg0OnxaVv3zpqLLxaHmsubEGyTnqdpI/CEBvX4JadI1dMSHxagThprYRtSVbuQxvi6iUatdPxohHpA==",
+      "version": "3.41.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
+      "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "browserslist": "^4.25.1"
+        "browserslist": "^4.24.4"
      },
      "funding": {
        "type": "opencollective",
@@ -2228,9 +2221,9 @@
      "license": "MIT"
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.5.195",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.195.tgz",
-      "integrity": "sha512-URclP0iIaDUzqcAyV1v2PgduJ9N0IdXmWsnPzPfelvBmjmZzEy6xJcjb1cXj+TbYqXgtLrjHEoaSIdTYhw4ezg==",
+      "version": "1.5.137",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.137.tgz",
+      "integrity": "sha512-/QSJaU2JyIuTbbABAo/crOs+SuAZLS+fVVS10PVrIT9hrRkmZl8Hb0xPSkKRUUWHQtYzXHpQUW3Dy5hwMzGZkA==",
      "dev": true,
      "license": "ISC"
    },
@@ -2313,9 +2306,9 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.32.0.tgz",
-      "integrity": "sha512-LSehfdpgMeWcTZkWZVIJl+tkZ2nuSkyyB9C27MZqFWXuph7DvaowgcTvKqxvpLW1JZIk8PN7hFY3Rj9LQ7m7lg==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
+      "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -2325,8 +2318,8 @@
        "@eslint/config-helpers": "^0.3.0",
        "@eslint/core": "^0.15.0",
        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.32.0",
-        "@eslint/plugin-kit": "^0.3.4",
+        "@eslint/js": "9.31.0",
+        "@eslint/plugin-kit": "^0.3.1",
        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@humanwhocodes/retry": "^0.4.2",
@@ -2421,39 +2414,65 @@
      }
    },
    "node_modules/eslint-plugin-unicorn": {
-      "version": "60.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-60.0.0.tgz",
-      "integrity": "sha512-QUzTefvP8stfSXsqKQ+vBQSEsXIlAiCduS/V1Em+FKgL9c21U/IIm20/e3MFy1jyCf14tHAhqC1sX8OTy6VUCg==",
+      "version": "59.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-59.0.1.tgz",
+      "integrity": "sha512-EtNXYuWPUmkgSU2E7Ttn57LbRREQesIP1BiLn7OZLKodopKfDXfBUkC/0j6mpw2JExwf43Uf3qLSvrSvppgy8Q==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@eslint/plugin-kit": "^0.3.3",
-        "change-case": "^5.4.4",
-        "ci-info": "^4.3.0",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@eslint-community/eslint-utils": "^4.5.1",
+        "@eslint/plugin-kit": "^0.2.7",
+        "ci-info": "^4.2.0",
        "clean-regexp": "^1.0.0",
-        "core-js-compat": "^3.44.0",
+        "core-js-compat": "^3.41.0",
        "esquery": "^1.6.0",
        "find-up-simple": "^1.0.1",
-        "globals": "^16.3.0",
+        "globals": "^16.0.0",
        "indent-string": "^5.0.0",
        "is-builtin-module": "^5.0.0",
        "jsesc": "^3.1.0",
        "pluralize": "^8.0.0",
        "regexp-tree": "^0.1.27",
        "regjsparser": "^0.12.0",
-        "semver": "^7.7.2",
+        "semver": "^7.7.1",
        "strip-indent": "^4.0.0"
      },
      "engines": {
-        "node": "^20.10.0 || >=21.0.0"
+        "node": "^18.20.0 || ^20.10.0 || >=21.0.0"
      },
      "funding": {
        "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
      },
      "peerDependencies": {
-        "eslint": ">=9.29.0"
+        "eslint": ">=9.22.0"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/@eslint/core": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
+      "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/@eslint/plugin-kit": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
+      "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.13.0",
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      }
    },
    "node_modules/eslint-scope": {
@@ -2486,6 +2505,19 @@
        "url": "https://opencollective.com/eslint"
      }
    },
+    "node_modules/eslint/node_modules/@eslint/core": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
+      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
    "node_modules/espree": {
      "version": "10.4.0",
      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
@@ -3695,9 +3727,9 @@
      }
    },
    "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
      "dev": true,
      "license": "ISC",
      "bin": {
@@ -4179,15 +4211,15 @@
      }
    },
    "node_modules/vite": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.6.tgz",
-      "integrity": "sha512-MHFiOENNBd+Bd9uvc8GEsIzdkn1JxMmEeYX35tI3fv0sJBUTfW5tQsoaOwuY4KhBI09A3dUJ/DXf2yxPVPUceg==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.5.tgz",
+      "integrity": "sha512-1mncVwJxy2C9ThLwz0+2GKZyEXuC3MyWtAAlNftlZZXZDP3AJt5FmwcMit/IGGaNZ8ZOB2BNO/HFUB+CpN0NQw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.4.6",
-        "picomatch": "^4.0.3",
+        "picomatch": "^4.0.2",
        "postcss": "^8.5.6",
        "rollup": "^4.40.0",
        "tinyglobby": "^0.2.14"
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/cli",
-  "version": "2.2.77",
+  "version": "2.2.76",
  "description": "Command Line Interface (CLI) for Immich",
  "type": "module",
  "exports": "./dist/index.js",
@@ -21,7 +21,7 @@
    "@types/lodash-es": "^4.17.12",
    "@types/micromatch": "^4.0.9",
    "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.17.0",
+    "@types/node": "^22.16.5",
    "@vitest/coverage-v8": "^3.0.0",
    "byte-size": "^9.0.0",
    "cli-progress": "^3.12.0",
@@ -29,7 +29,7 @@
    "eslint": "^9.14.0",
    "eslint-config-prettier": "^10.1.8",
    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^60.0.0",
+    "eslint-plugin-unicorn": "^59.0.0",
    "globals": "^16.0.0",
    "mock-fs": "^5.2.0",
    "prettier": "^3.2.5",
@@ -69,6 +69,6 @@
    "micromatch": "^4.0.8"
  },
  "volta": {
-    "node": "22.18.0"
+    "node": "22.17.1"
  }
 }
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -95,7 +95,7 @@ services:
    command: ['./run.sh', '-disable-reporting']
    ports:
      - 3000:3000
-    image: grafana/grafana:12.1.0-ubuntu@sha256:397aa30dd1af16cb6c5c9879498e467973a7f87eacf949f6d5a29407a3843809
+    image: grafana/grafana:12.0.2-ubuntu@sha256:0512d81cdeaaff0e370a9aa66027b465d1f1f04379c3a9c801a905fabbdbc7a5
    volumes:
      - grafana-data:/var/lib/grafana

--- a/docs/.nvmrc
+++ b/docs/.nvmrc
@@ -1 +1 @@
-22.18.0
+22.17.1
--- a/docs/package.json
+++ b/docs/package.json
@@ -59,6 +59,6 @@
    "node": ">=20"
  },
  "volta": {
-    "node": "22.18.0"
+    "node": "22.17.1"
  }
 }
--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,8 +1,4 @@
 [
-  {
-    "label": "v1.137.3",
-    "url": "https://v1.137.3.archive.immich.app"
-  },
  {
    "label": "v1.137.2",
    "url": "https://v1.137.2.archive.immich.app"
--- a/e2e/.nvmrc
+++ b/e2e/.nvmrc
@@ -1 +1 @@
-22.18.0
+22.17.1
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "immich-e2e",
-  "version": "1.137.3",
+  "version": "1.137.2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "immich-e2e",
-      "version": "1.137.3",
+      "version": "1.137.2",
      "license": "GNU Affero General Public License version 3",
      "devDependencies": {
        "@eslint/eslintrc": "^3.1.0",
@@ -16,7 +16,7 @@
        "@playwright/test": "^1.44.1",
        "@socket.io/component-emitter": "^3.1.2",
        "@types/luxon": "^3.4.2",
-        "@types/node": "^22.17.0",
+        "@types/node": "^22.16.5",
        "@types/oidc-provider": "^9.0.0",
        "@types/pg": "^8.15.1",
        "@types/pngjs": "^6.0.4",
@@ -25,7 +25,7 @@
        "eslint": "^9.14.0",
        "eslint-config-prettier": "^10.1.8",
        "eslint-plugin-prettier": "^5.1.3",
-        "eslint-plugin-unicorn": "^60.0.0",
+        "eslint-plugin-unicorn": "^59.0.0",
        "exiftool-vendored": "^28.3.1",
        "globals": "^16.0.0",
        "jose": "^5.6.3",
@@ -46,7 +46,7 @@
    },
    "../cli": {
      "name": "@immich/cli",
-      "version": "2.2.77",
+      "version": "2.2.76",
      "dev": true,
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
@@ -68,7 +68,7 @@
        "@types/lodash-es": "^4.17.12",
        "@types/micromatch": "^4.0.9",
        "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.17.0",
+        "@types/node": "^22.16.5",
        "@vitest/coverage-v8": "^3.0.0",
        "byte-size": "^9.0.0",
        "cli-progress": "^3.12.0",
@@ -76,7 +76,7 @@
        "eslint": "^9.14.0",
        "eslint-config-prettier": "^10.1.8",
        "eslint-plugin-prettier": "^5.1.3",
-        "eslint-plugin-unicorn": "^60.0.0",
+        "eslint-plugin-unicorn": "^59.0.0",
        "globals": "^16.0.0",
        "mock-fs": "^5.2.0",
        "prettier": "^3.2.5",
@@ -95,14 +95,14 @@
    },
    "../open-api/typescript-sdk": {
      "name": "@immich/sdk",
-      "version": "1.137.3",
+      "version": "1.137.2",
      "dev": true,
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@oazapfts/runtime": "^1.0.2"
      },
      "devDependencies": {
-        "@types/node": "^22.17.0",
+        "@types/node": "^22.16.5",
        "typescript": "^5.3.3"
      }
    },
@@ -131,9 +131,9 @@
      }
    },
    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -684,9 +684,9 @@
      }
    },
    "node_modules/@eslint/core": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
+      "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
@@ -734,9 +734,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.32.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.32.0.tgz",
-      "integrity": "sha512-BBpRFZK3eX6uMLKz8WxFOBIFFcGFJ/g8XuwjTHCqHROSIsopI+ddn/d5Cfh36+7+e5edVS8dbSHnBNhrLEX0zg==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
+      "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -757,13 +757,13 @@
      }
    },
    "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.4.tgz",
-      "integrity": "sha512-Ul5l+lHEcw3L5+k8POx6r74mxEYKG5kOb6Xpy2gCRW6zweT6TEhAf8vhxGgjhqrd/VO/Dirhsb+1hNpD1ue9hw==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
+      "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@eslint/core": "^0.15.1",
+        "@eslint/core": "^0.14.0",
        "levn": "^0.4.1"
      },
      "engines": {
@@ -1999,9 +1999,9 @@
      }
    },
    "node_modules/@types/luxon": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
-      "integrity": "sha512-H3iskjFIAn5SlJU7OuxUmTEpebK6TKB8rxZShDslBMZJ5u9S//KM1sbdAisiSrqwLQncVjnpi2OK2J51h+4lsg==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.2.tgz",
+      "integrity": "sha512-R/BdP7OxEMc44l2Ex5lSXHoIXTB2JLNa3y2QISIbr58U/YcsffyQrYW//hZSdrfxrjRZj3GcUoxMPGdO8gSYuw==",
      "dev": true,
      "license": "MIT"
    },
@@ -2020,9 +2020,9 @@
      "license": "MIT"
    },
    "node_modules/@types/node": {
-      "version": "22.17.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.0.tgz",
-      "integrity": "sha512-bbAKTCqX5aNVryi7qXVMi+OkB3w/OyblodicMbvE38blyAz7GxXf6XYhklokijuPwwVg9sDLKRxt0ZHXQwZVfQ==",
+      "version": "22.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.16.5.tgz",
+      "integrity": "sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -2030,9 +2030,9 @@
      }
    },
    "node_modules/@types/oidc-provider": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@types/oidc-provider/-/oidc-provider-9.1.2.tgz",
-      "integrity": "sha512-JAreXkbWsZR72Gt3eigG652wq1qBcjhuy421PXU2a8PS0mM00XlG+UdXbM/QPihM3ko0YF8cwvt0H2kacXGcsg==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/oidc-provider/-/oidc-provider-9.1.1.tgz",
+      "integrity": "sha512-sG4UcE4AbUwAsEpyrcyoqZ383wJiQObZU+gTa1Iv288+l09HwSr88hBZE2IBLlXS+RKmLId0i4B430PBFO/XRA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -2042,9 +2042,9 @@
      }
    },
    "node_modules/@types/pg": {
-      "version": "8.15.5",
-      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.5.tgz",
-      "integrity": "sha512-LF7lF6zWEKxuT3/OR8wAZGzkg4ENGXFNyiV/JeOt9z5B+0ZVwbql9McqX5c/WStFq1GaGso7H1AzP/qSzmlCKQ==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.4.tgz",
+      "integrity": "sha512-I6UNVBAoYbvuWkkU3oosC8yxqH21f4/Jc4DK71JLG3dT2mdlGe1z+ep/LQGXaKaOgcvUrsQoPRqfgtMcvZiJhg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -2741,9 +2741,9 @@
      }
    },
    "node_modules/browserslist": {
-      "version": "4.25.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
-      "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
      "dev": true,
      "funding": [
        {
@@ -2761,10 +2761,10 @@
      ],
      "license": "MIT",
      "dependencies": {
-        "caniuse-lite": "^1.0.30001726",
-        "electron-to-chromium": "^1.5.173",
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
+        "update-browserslist-db": "^1.1.1"
      },
      "bin": {
        "browserslist": "cli.js"
@@ -2862,9 +2862,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001731",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001731.tgz",
-      "integrity": "sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==",
+      "version": "1.0.30001713",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz",
+      "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
      "dev": true,
      "funding": [
        {
@@ -2916,13 +2916,6 @@
        "url": "https://github.com/chalk/chalk?sponsor=1"
      }
    },
-    "node_modules/change-case": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
-      "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/check-error": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
@@ -2944,9 +2937,9 @@
      }
    },
    "node_modules/ci-info": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-      "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz",
+      "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==",
      "dev": true,
      "funding": [
        {
@@ -3119,13 +3112,13 @@
      }
    },
    "node_modules/core-js-compat": {
-      "version": "3.45.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.0.tgz",
-      "integrity": "sha512-gRoVMBawZg0OnxaVv3zpqLLxaHmsubEGyTnqdpI/CEBvX4JadI1dMSHxagThprYRtSVbuQxvi6iUatdPxohHpA==",
+      "version": "3.41.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
+      "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "browserslist": "^4.25.1"
+        "browserslist": "^4.24.4"
      },
      "funding": {
        "type": "opencollective",
@@ -3278,9 +3271,9 @@
      "license": "MIT"
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.5.195",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.195.tgz",
-      "integrity": "sha512-URclP0iIaDUzqcAyV1v2PgduJ9N0IdXmWsnPzPfelvBmjmZzEy6xJcjb1cXj+TbYqXgtLrjHEoaSIdTYhw4ezg==",
+      "version": "1.5.137",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.137.tgz",
+      "integrity": "sha512-/QSJaU2JyIuTbbABAo/crOs+SuAZLS+fVVS10PVrIT9hrRkmZl8Hb0xPSkKRUUWHQtYzXHpQUW3Dy5hwMzGZkA==",
      "dev": true,
      "license": "ISC"
    },
@@ -3471,9 +3464,9 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.32.0.tgz",
-      "integrity": "sha512-LSehfdpgMeWcTZkWZVIJl+tkZ2nuSkyyB9C27MZqFWXuph7DvaowgcTvKqxvpLW1JZIk8PN7hFY3Rj9LQ7m7lg==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
+      "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -3483,8 +3476,8 @@
        "@eslint/config-helpers": "^0.3.0",
        "@eslint/core": "^0.15.0",
        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.32.0",
-        "@eslint/plugin-kit": "^0.3.4",
+        "@eslint/js": "9.31.0",
+        "@eslint/plugin-kit": "^0.3.1",
        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@humanwhocodes/retry": "^0.4.2",
@@ -3579,39 +3572,65 @@
      }
    },
    "node_modules/eslint-plugin-unicorn": {
-      "version": "60.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-60.0.0.tgz",
-      "integrity": "sha512-QUzTefvP8stfSXsqKQ+vBQSEsXIlAiCduS/V1Em+FKgL9c21U/IIm20/e3MFy1jyCf14tHAhqC1sX8OTy6VUCg==",
+      "version": "59.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-59.0.1.tgz",
+      "integrity": "sha512-EtNXYuWPUmkgSU2E7Ttn57LbRREQesIP1BiLn7OZLKodopKfDXfBUkC/0j6mpw2JExwf43Uf3qLSvrSvppgy8Q==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@eslint/plugin-kit": "^0.3.3",
-        "change-case": "^5.4.4",
-        "ci-info": "^4.3.0",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@eslint-community/eslint-utils": "^4.5.1",
+        "@eslint/plugin-kit": "^0.2.7",
+        "ci-info": "^4.2.0",
        "clean-regexp": "^1.0.0",
-        "core-js-compat": "^3.44.0",
+        "core-js-compat": "^3.41.0",
        "esquery": "^1.6.0",
        "find-up-simple": "^1.0.1",
-        "globals": "^16.3.0",
+        "globals": "^16.0.0",
        "indent-string": "^5.0.0",
        "is-builtin-module": "^5.0.0",
        "jsesc": "^3.1.0",
        "pluralize": "^8.0.0",
        "regexp-tree": "^0.1.27",
        "regjsparser": "^0.12.0",
-        "semver": "^7.7.2",
+        "semver": "^7.7.1",
        "strip-indent": "^4.0.0"
      },
      "engines": {
-        "node": "^20.10.0 || >=21.0.0"
+        "node": "^18.20.0 || ^20.10.0 || >=21.0.0"
      },
      "funding": {
        "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
      },
      "peerDependencies": {
-        "eslint": ">=9.29.0"
+        "eslint": ">=9.22.0"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/@eslint/core": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
+      "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/@eslint/plugin-kit": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
+      "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.13.0",
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      }
    },
    "node_modules/eslint-scope": {
@@ -3644,6 +3663,19 @@
        "url": "https://opencollective.com/eslint"
      }
    },
+    "node_modules/eslint/node_modules/@eslint/core": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
+      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
    "node_modules/espree": {
      "version": "10.4.0",
      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-e2e",
-  "version": "1.137.3",
+  "version": "1.137.2",
  "description": "",
  "main": "index.js",
  "type": "module",
@@ -26,7 +26,7 @@
    "@playwright/test": "^1.44.1",
    "@socket.io/component-emitter": "^3.1.2",
    "@types/luxon": "^3.4.2",
-    "@types/node": "^22.17.0",
+    "@types/node": "^22.16.5",
    "@types/oidc-provider": "^9.0.0",
    "@types/pg": "^8.15.1",
    "@types/pngjs": "^6.0.4",
@@ -35,7 +35,7 @@
    "eslint": "^9.14.0",
    "eslint-config-prettier": "^10.1.8",
    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^60.0.0",
+    "eslint-plugin-unicorn": "^59.0.0",
    "exiftool-vendored": "^28.3.1",
    "globals": "^16.0.0",
    "jose": "^5.6.3",
@@ -54,6 +54,6 @@
    "vitest": "^3.0.0"
  },
  "volta": {
-    "node": "22.18.0"
+    "node": "22.17.1"
  }
 }
--- a/e2e/src/api/specs/shared-link.e2e-spec.ts
+++ b/e2e/src/api/specs/shared-link.e2e-spec.ts
@@ -9,7 +9,7 @@ import {
 } from '@immich/sdk';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
-import { app, asBearerAuth, baseUrl, shareUrl, utils } from 'src/utils';
+import { app, asBearerAuth, shareUrl, utils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, describe, expect, it } from 'vitest';

@@ -78,7 +78,6 @@ describe('/shared-links', () => {
          type: SharedLinkType.Album,
          albumId: metadataAlbum.id,
          showMetadata: true,
-          slug: 'metadata-album',
        }),
        utils.createSharedLink(user1.accessToken, {
          type: SharedLinkType.Album,
@@ -139,17 +138,6 @@ describe('/shared-links', () => {
    });
  });

-  describe('GET /s/:slug', () => {
-    it('should work for slug auth', async () => {
-      const resp = await request(baseUrl).get(`/s/${linkWithMetadata.slug}`);
-      expect(resp.status).toBe(200);
-      expect(resp.header['content-type']).toContain('text/html');
-      expect(resp.text).toContain(
-        `<meta name="description" content="${metadataAlbum.assets.length} shared photos &amp; videos" />`,
-      );
-    });
-  });
-
  describe('GET /shared-links', () => {
    it('should require authentication', async () => {
      const { status, body } = await request(app).get('/shared-links');
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -724,7 +724,6 @@
  "create_new_user": "Create new user",
  "create_shared_album_page_share_add_assets": "ADD ASSETS",
  "create_shared_album_page_share_select_photos": "Select Photos",
-  "create_shared_link": "Create shared link",
  "create_tag": "Create tag",
  "create_tag_description": "Create a new tag. For nested tags, please enter the full path of the tag including forward slashes.",
  "create_user": "Create user",
@@ -1174,7 +1173,6 @@
  "latest_version": "Latest Version",
  "latitude": "Latitude",
  "leave": "Leave",
-  "leave_album": "Leave album",
  "lens_model": "Lens model",
  "let_others_respond": "Let others respond",
  "level": "Level",
@@ -1254,7 +1252,7 @@
  "manage_your_devices": "Manage your logged-in devices",
  "manage_your_oauth_connection": "Manage your OAuth connection",
  "map": "Map",
-  "map_assets_in_bounds": "{count, plural, =0 {No photos in this area} one {# photo} other {# photos}}",
+  "map_assets_in_bounds": "{count, plural, one {# photo} other {# photos}}",
  "map_cannot_get_user_location": "Cannot get user's location",
  "map_location_dialog_yes": "Yes",
  "map_location_picker_page_use_location": "Use this location",
@@ -1262,6 +1260,7 @@
  "map_location_service_disabled_title": "Location Service disabled",
  "map_marker_for_images": "Map marker for images taken in {city}, {country}",
  "map_marker_with_image": "Map marker with image",
+  "map_no_assets_in_bounds": "No photos in this area",
  "map_no_location_permission_content": "Location permission is needed to display assets from your current location. Do you want to allow it now?",
  "map_no_location_permission_title": "Location Permission denied",
  "map_settings": "Map settings",
--- 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
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v26.0.0), do not edit directly.
+// Autogenerated from Pigeon (v25.3.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")

--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImmichAPI.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImmichAPI.kt
@@ -24,23 +24,14 @@ class ImmichAPI(cfg: ServerConfig) {

      val serverURL = prefs.getString("widget_server_url", "") ?: ""
      val sessionKey = prefs.getString("widget_auth_token", "") ?: ""
-      val customHeadersJSON = prefs.getString("widget_custom_headers", "") ?: ""

      if (serverURL.isBlank() || sessionKey.isBlank()) {
        return null
      }

-      var customHeaders: Map<String, String> = HashMap<String, String>()
-
-      if (customHeadersJSON.isNotBlank()) {
-        val stringMapType = object : TypeToken<Map<String, String>>() {}.type
-        customHeaders = Gson().fromJson(customHeadersJSON, stringMapType)
-      }
-
      return ServerConfig(
        serverURL,
-        sessionKey,
-        customHeaders
+        sessionKey
      )
    }
  }
@@ -59,19 +50,11 @@ class ImmichAPI(cfg: ServerConfig) {
    return URL(urlString.toString())
  }

-  private fun HttpURLConnection.applyCustomHeaders() {
-    serverConfig.customHeaders.forEach { (key, value) ->
-      setRequestProperty(key, value)
-    }
-  }
-
  suspend fun fetchSearchResults(filters: SearchFilters): List<Asset> = withContext(Dispatchers.IO) {
    val url = buildRequestURL("/search/random")
    val connection = (url.openConnection() as HttpURLConnection).apply {
      requestMethod = "POST"
      setRequestProperty("Content-Type", "application/json")
-      applyCustomHeaders()
-
      doOutput = true
    }

@@ -92,7 +75,6 @@ class ImmichAPI(cfg: ServerConfig) {
    val url = buildRequestURL("/memories", listOf("for" to iso8601))
    val connection = (url.openConnection() as HttpURLConnection).apply {
      requestMethod = "GET"
-      applyCustomHeaders()
    }

    val response = connection.inputStream.bufferedReader().readText()
@@ -112,7 +94,6 @@ class ImmichAPI(cfg: ServerConfig) {
    val url = buildRequestURL("/albums")
    val connection = (url.openConnection() as HttpURLConnection).apply {
      requestMethod = "GET"
-      applyCustomHeaders()
    }

    val response = connection.inputStream.bufferedReader().readText()
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/model/Model.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/model/Model.kt
@@ -55,11 +55,7 @@ data class WidgetEntry (
  val deeplink: String?
 )

-data class ServerConfig(
-  val serverEndpoint: String,
-  val sessionKey: String,
-  val customHeaders: Map<String, String>
-)
+data class ServerConfig(val serverEndpoint: String, val sessionKey: String)

 // MARK: Widget State Keys
 val kImageUUID = stringPreferencesKey("uuid")
--- a/mobile/android/fastlane/Fastfile
+++ b/mobile/android/fastlane/Fastfile
@@ -36,7 +36,7 @@ platform :android do
      build_type: 'Release',
      properties: {
        "android.injected.version.code" => 3002,
-        "android.injected.version.name" => "1.137.3",
+        "android.injected.version.name" => "1.137.2",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')
--- a/mobile/ios/Runner/Sync/Messages.g.swift
+++ b/mobile/ios/Runner/Sync/Messages.g.swift
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v26.0.0), do not edit directly.
+// Autogenerated from Pigeon (v25.3.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon

 import Foundation
--- a/mobile/ios/WidgetExtension/ImmichAPI.swift
+++ b/mobile/ios/WidgetExtension/ImmichAPI.swift
@@ -104,13 +104,10 @@ struct Album: Codable, Equatable {
 // MARK: API

 class ImmichAPI {
-  typealias CustomHeaders = [String:String]
  struct ServerConfig {
    let serverEndpoint: String
    let sessionKey: String
-    let customHeaders: CustomHeaders
  }
-  
  let serverConfig: ServerConfig

  init() async throws {
@@ -125,20 +122,10 @@ class ImmichAPI {
    if serverURL == "" || sessionKey == "" {
      throw WidgetError.noLogin
    }
-    
-    // custom headers come in the form of KV pairs in JSON
-    var customHeadersJSON = (defaults.string(forKey: "widget_custom_headers") ?? "")
-    var customHeaders: CustomHeaders = [:]
-    
-    if customHeadersJSON != "",
-       let parsedHeaders = try? JSONDecoder().decode(CustomHeaders.self, from: customHeadersJSON.data(using: .utf8)!) {
-      customHeaders = parsedHeaders
-    }

    serverConfig = ServerConfig(
      serverEndpoint: serverURL,
-      sessionKey: sessionKey,
-      customHeaders: customHeaders
+      sessionKey: sessionKey
    )
  }

@@ -168,12 +155,6 @@ class ImmichAPI {

    return components?.url
  }
-  
-  func applyCustomHeaders(for request: inout URLRequest) {
-    for (header, value) in serverConfig.customHeaders {
-      request.addValue(value, forHTTPHeaderField: header)
-    }
-  }

  func fetchSearchResults(with filters: SearchFilter = Album.NONE.filter)
    async throws
@@ -193,8 +174,7 @@ class ImmichAPI {
    request.httpMethod = "POST"
    request.httpBody = try JSONEncoder().encode(filters)
    request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-    applyCustomHeaders(for: &request)
-    
+
    let (data, _) = try await URLSession.shared.data(for: request)

    // decode data
@@ -216,7 +196,6 @@ class ImmichAPI {

    var request = URLRequest(url: searchURL)
    request.httpMethod = "GET"
-    applyCustomHeaders(for: &request)

    let (data, _) = try await URLSession.shared.data(for: request)

@@ -275,8 +254,7 @@ class ImmichAPI {

    var request = URLRequest(url: searchURL)
    request.httpMethod = "GET"
-    applyCustomHeaders(for: &request)
-    
+
    let (data, _) = try await URLSession.shared.data(for: request)

    // decode data
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -22,7 +22,7 @@ platform :ios do
      path: "./Runner.xcodeproj",
    )
    increment_version_number(
-      version_number: "1.137.3"
+      version_number: "1.137.2"
    )
    increment_build_number(
      build_number: latest_testflight_build_number + 1,
--- a/mobile/lib/constants/constants.dart
+++ b/mobile/lib/constants/constants.dart
@@ -30,10 +30,9 @@ const int kTimelineAssetLoadBatchSize = 256;
 const int kTimelineAssetLoadOppositeSize = 64;

 // Widget keys
-const String appShareGroupId = "group.app.immich.share";
 const String kWidgetAuthToken = "widget_auth_token";
 const String kWidgetServerEndpoint = "widget_server_url";
-const String kWidgetCustomHeaders = "widget_custom_headers";
+const String appShareGroupId = "group.app.immich.share";

 // add widget identifiers here for new widgets
 // these are used to force a widget refresh
--- a/mobile/lib/domain/services/hash.service.dart
+++ b/mobile/lib/domain/services/hash.service.dart
@@ -96,7 +96,7 @@ class HashService {
      if (hash?.length == 20) {
        hashed.add(asset.copyWith(checksum: base64.encode(hash!)));
      } else {
-        _log.warning("Failed to hash file for ${asset.id}: ${asset.name} created at ${asset.createdAt}");
+        _log.warning("Failed to hash file for ${asset.id}");
      }
    }

--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -128,18 +128,6 @@ class RemoteAlbumService {
    return _repository.addUsers(albumId, userIds);
  }

-  Future<void> removeUser(String albumId, {required String userId}) async {
-    await _albumApiRepository.removeUser(albumId, userId: userId);
-
-    return _repository.removeUser(albumId, userId: userId);
-  }
-
-  Future<void> setActivityStatus(String albumId, bool enabled) async {
-    await _albumApiRepository.setActivityStatus(albumId, enabled);
-
-    return _repository.setActivityStatus(albumId, enabled);
-  }
-
  Future<int> getCount() {
    return _repository.getCount();
  }
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -139,18 +139,14 @@ class SyncStreamService {
        return _syncStreamRepository.updateAlbumUsersV1(data.cast(), debugLabel: 'backfill');
      case SyncEntityType.albumUserDeleteV1:
        return _syncStreamRepository.deleteAlbumUsersV1(data.cast());
-      case SyncEntityType.albumAssetCreateV1:
-        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album asset create');
-      case SyncEntityType.albumAssetUpdateV1:
-        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album asset update');
+      case SyncEntityType.albumAssetV1:
+        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album');
      case SyncEntityType.albumAssetBackfillV1:
-        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album asset backfill');
-      case SyncEntityType.albumAssetExifCreateV1:
-        return _syncStreamRepository.updateAssetsExifV1(data.cast(), debugLabel: 'album asset exif create');
-      case SyncEntityType.albumAssetExifUpdateV1:
-        return _syncStreamRepository.updateAssetsExifV1(data.cast(), debugLabel: 'album asset exif update');
+        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album backfill');
+      case SyncEntityType.albumAssetExifV1:
+        return _syncStreamRepository.updateAssetsExifV1(data.cast(), debugLabel: 'album');
      case SyncEntityType.albumAssetExifBackfillV1:
-        return _syncStreamRepository.updateAssetsExifV1(data.cast(), debugLabel: 'album asset exif backfill');
+        return _syncStreamRepository.updateAssetsExifV1(data.cast(), debugLabel: 'album backfill');
      case SyncEntityType.albumToAssetV1:
        return _syncStreamRepository.updateAlbumToAssetsV1(data.cast());
      case SyncEntityType.albumToAssetBackfillV1:
--- a/mobile/lib/domain/utils/background_sync.dart
+++ b/mobile/lib/domain/utils/background_sync.dart
@@ -37,7 +37,7 @@ class BackgroundSyncManager {
    this.onHashingError,
  });

-  Future<void> cancel() async {
+  Future<void> cancel() {
    final futures = <Future>[];

    if (_syncTask != null) {
@@ -52,11 +52,7 @@ class BackgroundSyncManager {
    _syncWebsocketTask?.cancel();
    _syncWebsocketTask = null;

-    try {
-      await Future.wait(futures);
-    } on CanceledError {
-      // Ignore cancellation errors
-    }
+    return Future.wait(futures);
  }

  // No need to cancel the task, as it can also be run when the user logs out
--- a/mobile/lib/extensions/build_context_extensions.dart
+++ b/mobile/lib/extensions/build_context_extensions.dart
@@ -13,9 +13,6 @@ extension ContextHelper on BuildContext {
  // Returns the current height from MediaQuery
  double get height => MediaQuery.sizeOf(this).height;

-  // Returns the current size from MediaQuery
-  Size get sizeData => MediaQuery.sizeOf(this);
-
  // Returns true if the app is running on a mobile device (!tablets)
  bool get isMobile => width < 550;

--- a/mobile/lib/extensions/codec_extensions.dart
+++ b/mobile/lib/extensions/codec_extensions.dart
@@ -1,10 +0,0 @@
-import 'dart:ui';
-
-import 'package:flutter/painting.dart';
-
-extension CodecImageInfoExtension on Codec {
-  Future<ImageInfo> getImageInfo({double scale = 1.0}) async {
-    final frame = await getNextFrame();
-    return ImageInfo(image: frame.image, scale: scale);
-  }
-}
--- a/mobile/lib/infrastructure/repositories/backup.repository.dart
+++ b/mobile/lib/infrastructure/repositories/backup.repository.dart
@@ -113,7 +113,6 @@ class DriftBackupRepository extends DriftDatabaseRepository {
    final query = _db.localAssetEntity.select()
      ..where(
        (lae) =>
-            lae.checksum.isNotNull() &
            existsQuery(
              _db.localAlbumAssetEntity.selectOnly()
                ..addColumns([_db.localAlbumAssetEntity.assetId])
@@ -126,7 +125,9 @@ class DriftBackupRepository extends DriftDatabaseRepository {
              _db.remoteAssetEntity.selectOnly()
                ..addColumns([_db.remoteAssetEntity.checksum])
                ..where(
-                  _db.remoteAssetEntity.checksum.equalsExp(lae.checksum) & _db.remoteAssetEntity.ownerId.equals(userId),
+                  _db.remoteAssetEntity.checksum.equalsExp(lae.checksum) &
+                      _db.remoteAssetEntity.ownerId.equals(userId) &
+                      lae.checksum.isNotNull(),
                ),
            ) &
            lae.id.isNotInQuery(_getExcludedSubquery()),
--- a/mobile/lib/infrastructure/repositories/people.repository.dart
+++ b/mobile/lib/infrastructure/repositories/people.repository.dart
@@ -24,7 +24,7 @@ class DriftPeopleRepository extends DriftDatabaseRepository {
            leftOuterJoin(_db.assetFaceEntity, _db.assetFaceEntity.personId.equalsExp(_db.personEntity.id)),
          ])
          ..where(_db.personEntity.isHidden.equals(false))
-          ..groupBy([_db.personEntity.id], having: _db.assetFaceEntity.id.count().isBiggerOrEqualValue(3))
+          ..groupBy([_db.personEntity.id])
          ..orderBy([
            OrderingTerm(expression: _db.personEntity.name.equals('').not(), mode: OrderingMode.desc),
            OrderingTerm(expression: _db.assetFaceEntity.id.count(), mode: OrderingMode.desc),
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -220,22 +220,12 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
    });
  }

-  Future<void> removeUser(String albumId, {required String userId}) {
-    return _db.remoteAlbumUserEntity.deleteWhere((row) => row.albumId.equals(albumId) & row.userId.equals(userId));
-  }
-
  Future<void> deleteAlbum(String albumId) async {
    return _db.transaction(() async {
      await _db.remoteAlbumEntity.deleteWhere((table) => table.id.equals(albumId));
    });
  }

-  Future<void> setActivityStatus(String albumId, bool isEnabled) async {
-    final query = _db.update(_db.remoteAlbumEntity)..where((row) => row.id.equals(albumId));
-
-    await query.write(RemoteAlbumEntityCompanion(isActivityEnabled: Value(isEnabled)));
-  }
-
  Stream<RemoteAlbum?> watchAlbum(String albumId) {
    final query =
        _db.remoteAlbumEntity.select().join([
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -149,11 +149,9 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
  SyncEntityType.albumUserV1: SyncAlbumUserV1.fromJson,
  SyncEntityType.albumUserBackfillV1: SyncAlbumUserV1.fromJson,
  SyncEntityType.albumUserDeleteV1: SyncAlbumUserDeleteV1.fromJson,
-  SyncEntityType.albumAssetCreateV1: SyncAssetV1.fromJson,
-  SyncEntityType.albumAssetUpdateV1: SyncAssetV1.fromJson,
+  SyncEntityType.albumAssetV1: SyncAssetV1.fromJson,
  SyncEntityType.albumAssetBackfillV1: SyncAssetV1.fromJson,
-  SyncEntityType.albumAssetExifCreateV1: SyncAssetExifV1.fromJson,
-  SyncEntityType.albumAssetExifUpdateV1: SyncAssetExifV1.fromJson,
+  SyncEntityType.albumAssetExifV1: SyncAssetExifV1.fromJson,
  SyncEntityType.albumAssetExifBackfillV1: SyncAssetExifV1.fromJson,
  SyncEntityType.albumToAssetV1: SyncAlbumToAssetV1.fromJson,
  SyncEntityType.albumToAssetBackfillV1: SyncAlbumToAssetV1.fromJson,
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -23,7 +23,7 @@ import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/theme.provider.dart';
 import 'package:immich_mobile/routing/app_navigation_observer.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/services/backgroundLegacy.service.dart';
+import 'package:immich_mobile/services/background.service.dart';
 import 'package:immich_mobile/services/deep_link.service.dart';
 import 'package:immich_mobile/services/local_notification.service.dart';
 import 'package:immich_mobile/theme/dynamic_theme.dart';
@@ -83,6 +83,7 @@ Future<void> initApp() async {
  };

  PlatformDispatcher.instance.onError = (error, stack) {
+    debugPrint("FlutterError - Catch all: $error \n $stack");
    log.severe('PlatformDispatcher - Catch all', error, stack);
    return true;
  };
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -139,50 +137,25 @@ void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
  ref.read(tabProvider.notifier).state = TabEnum.values[index];
 }

-class _BottomNavigationBar extends ConsumerStatefulWidget {
+class _BottomNavigationBar extends ConsumerWidget {
  const _BottomNavigationBar({required this.tabsRouter, required this.destinations});

  final List<Widget> destinations;
  final TabsRouter tabsRouter;

  @override
-  ConsumerState createState() => _BottomNavigationBarState();
-}
-
-class _BottomNavigationBarState extends ConsumerState<_BottomNavigationBar> {
-  bool hideNavigationBar = false;
-  StreamSubscription? _eventSubscription;
-
-  @override
-  void initState() {
-    super.initState();
-    _eventSubscription = EventStream.shared.listen<MultiSelectToggleEvent>(_onEvent);
-  }
-
-  void _onEvent(MultiSelectToggleEvent event) {
-    setState(() {
-      hideNavigationBar = event.isEnabled;
-    });
-  }
-
-  @override
-  void dispose() {
-    _eventSubscription?.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
    final isScreenLandscape = context.orientation == Orientation.landscape;
+    final isMultiselectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));

-    if (isScreenLandscape || hideNavigationBar) {
+    if (isScreenLandscape || isMultiselectEnabled) {
      return const SizedBox.shrink();
    }

    return NavigationBar(
-      selectedIndex: widget.tabsRouter.activeIndex,
-      onDestinationSelected: (index) => _onNavigationSelected(widget.tabsRouter, index, ref),
-      destinations: widget.destinations,
+      selectedIndex: tabsRouter.activeIndex,
+      onDestinationSelected: (index) => _onNavigationSelected(tabsRouter, index, ref),
+      destinations: destinations,
    );
  }
 }
--- a/mobile/lib/pages/library/shared_link/shared_link_edit.page.dart
+++ b/mobile/lib/pages/library/shared_link/shared_link_edit.page.dart
@@ -264,15 +264,11 @@ class SharedLinkEditPage extends HookConsumerWidget {
            expiresAt: expiryAfter.value == 0 ? null : calculateExpiry(),
          );
      ref.invalidate(sharedLinksStateProvider);
-
-      await ref.read(serverInfoProvider.notifier).getServerConfig();
      final externalDomain = ref.read(serverInfoProvider.select((s) => s.serverConfig.externalDomain));
-
      var serverUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
      if (serverUrl != null && !serverUrl.endsWith('/')) {
        serverUrl += '/';
      }
-
      if (newLink != null && serverUrl != null) {
        newShareLink.value = "${serverUrl}share/${newLink.key}";
        copyLinkToClipboard();
--- a/mobile/lib/platform/native_sync_api.g.dart
+++ b/mobile/lib/platform/native_sync_api.g.dart
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v26.0.0), do not edit directly.
+// Autogenerated from Pigeon (v25.3.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers

--- a/mobile/lib/presentation/pages/dev/main_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
@@ -4,7 +4,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/presentation/widgets/memory/memory_lane.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';

@RoutePage()
 class MainTimelinePage extends ConsumerWidget {
@@ -13,24 +12,21 @@ class MainTimelinePage extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final memoryLaneProvider = ref.watch(driftMemoryFutureProvider);
-    final memoriesEnabled = ref.watch(currentUserProvider.select((user) => user?.memoryEnabled ?? true));
-
-    // TODO: the user preferences need to be updated
-    // from the server to get live hiding/showing of memory lane

    return memoryLaneProvider.maybeWhen(
      data: (memories) {
-        return memories.isEmpty || !memoriesEnabled
-            ? const Timeline()
+        return memories.isEmpty
+            ? const Timeline(showStorageIndicator: true)
            : Timeline(
                topSliverWidget: SliverToBoxAdapter(
                  key: Key('memory-lane-${memories.first.assets.first.id}'),
                  child: DriftMemoryLane(memories: memories),
                ),
                topSliverWidgetHeight: 200,
+                showStorageIndicator: true,
              );
      },
-      orElse: () => const Timeline(),
+      orElse: () => const Timeline(showStorageIndicator: true),
    );
  }
 }
--- a/mobile/lib/presentation/pages/drift_album_options.page.dart
+++ b/mobile/lib/presentation/pages/drift_album_options.page.dart
@@ -1,237 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/pages/drift_user_selection.page.dart';
-import 'package:immich_mobile/providers/auth.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
-
-@RoutePage()
-class DriftAlbumOptionsPage extends HookConsumerWidget {
-  const DriftAlbumOptionsPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final album = ref.watch(currentRemoteAlbumProvider);
-    if (album == null) {
-      return const SizedBox();
-    }
-
-    final sharedUsersAsync = ref.watch(remoteAlbumSharedUsersProvider(album.id));
-    final userId = ref.watch(authProvider).userId;
-    final activityEnabled = useState(album.isActivityEnabled);
-    final isOwner = album.ownerId == userId;
-
-    void showErrorMessage() {
-      context.pop();
-      ImmichToast.show(
-        context: context,
-        msg: "shared_album_section_people_action_error".t(context: context),
-        toastType: ToastType.error,
-        gravity: ToastGravity.BOTTOM,
-      );
-    }
-
-    void leaveAlbum() async {
-      try {
-        await ref.read(remoteAlbumProvider.notifier).leaveAlbum(album.id, userId: userId);
-        context.navigateTo(const DriftAlbumsRoute());
-      } catch (_) {
-        showErrorMessage();
-      }
-    }
-
-    void removeUserFromAlbum(UserDto user) async {
-      try {
-        await ref.read(remoteAlbumProvider.notifier).removeUser(album.id, user.id);
-        ref.invalidate(remoteAlbumSharedUsersProvider(album.id));
-      } catch (_) {
-        showErrorMessage();
-      }
-
-      context.pop();
-    }
-
-    Future<void> addUsers() async {
-      final newUsers = await context.pushRoute<List<String>>(DriftUserSelectionRoute(album: album));
-
-      if (newUsers == null || newUsers.isEmpty) {
-        return;
-      }
-
-      try {
-        await ref.read(remoteAlbumProvider.notifier).addUsers(album.id, newUsers);
-
-        if (newUsers.isNotEmpty) {
-          ImmichToast.show(
-            context: context,
-            msg: "users_added_to_album_count".t(context: context, args: {'count': newUsers.length}),
-            toastType: ToastType.success,
-          );
-        }
-
-        ref.invalidate(remoteAlbumSharedUsersProvider(album.id));
-      } catch (e) {
-        ImmichToast.show(
-          context: context,
-          msg: "Failed to add users to album: ${e.toString()}",
-          toastType: ToastType.error,
-        );
-      }
-    }
-
-    void handleUserClick(UserDto user) {
-      var actions = [];
-
-      if (user.id == userId) {
-        actions = [
-          ListTile(
-            leading: const Icon(Icons.exit_to_app_rounded),
-            title: const Text("leave_album").t(context: context),
-            onTap: leaveAlbum,
-          ),
-        ];
-      }
-
-      if (isOwner) {
-        actions = [
-          ListTile(
-            leading: const Icon(Icons.person_remove_rounded),
-            title: const Text("remove_user").t(context: context),
-            onTap: () => removeUserFromAlbum(user),
-          ),
-        ];
-      }
-
-      showModalBottomSheet(
-        backgroundColor: context.colorScheme.surfaceContainer,
-        isScrollControlled: false,
-        context: context,
-        builder: (context) {
-          return SafeArea(
-            child: Padding(
-              padding: const EdgeInsets.only(top: 24.0),
-              child: Column(mainAxisSize: MainAxisSize.min, children: [...actions]),
-            ),
-          );
-        },
-      );
-    }
-
-    buildOwnerInfo() {
-      if (isOwner) {
-        final owner = ref.watch(currentUserProvider);
-        return ListTile(
-          leading: owner != null ? UserCircleAvatar(user: owner) : const SizedBox(),
-          title: Text(album.ownerName, style: const TextStyle(fontWeight: FontWeight.w500)),
-          subtitle: Text(owner?.email ?? "", style: TextStyle(color: context.colorScheme.onSurfaceSecondary)),
-          trailing: Text("owner", style: context.textTheme.labelLarge).t(context: context),
-        );
-      } else {
-        final usersProvider = ref.watch(driftUsersProvider);
-        return usersProvider.maybeWhen(
-          data: (users) {
-            final user = users.firstWhereOrNull((u) => u.id == album.ownerId);
-
-            if (user == null) {
-              return const SizedBox();
-            }
-
-            return ListTile(
-              leading: UserCircleAvatar(user: user, radius: 22),
-              title: Text(user.name, style: const TextStyle(fontWeight: FontWeight.w500)),
-              subtitle: Text(user.email, style: TextStyle(color: context.colorScheme.onSurfaceSecondary)),
-              trailing: Text("owner", style: context.textTheme.labelLarge).t(context: context),
-            );
-          },
-          orElse: () => const SizedBox(),
-        );
-      }
-    }
-
-    buildSharedUsersList() {
-      return sharedUsersAsync.maybeWhen(
-        data: (sharedUsers) => ListView.builder(
-          primary: false,
-          shrinkWrap: true,
-          itemCount: sharedUsers.length,
-          itemBuilder: (context, index) {
-            final user = sharedUsers[index];
-            return ListTile(
-              leading: UserCircleAvatar(user: user, radius: 22),
-              title: Text(user.name, style: const TextStyle(fontWeight: FontWeight.w500)),
-              subtitle: Text(user.email, style: TextStyle(color: context.colorScheme.onSurfaceSecondary)),
-              trailing: userId == user.id || isOwner ? const Icon(Icons.more_horiz_rounded) : const SizedBox(),
-              onTap: userId == user.id || isOwner ? () => handleUserClick(user) : null,
-            );
-          },
-        ),
-        orElse: () => const Center(child: CircularProgressIndicator()),
-      );
-    }
-
-    buildSectionTitle(String text) {
-      return Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Text(text, style: context.textTheme.bodySmall),
-      );
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios_new_rounded),
-          onPressed: () => context.maybePop(null),
-        ),
-        centerTitle: true,
-        title: Text("options".t(context: context)),
-      ),
-      body: ListView(
-        children: [
-          const SizedBox(height: 8),
-          if (isOwner)
-            SwitchListTile.adaptive(
-              value: activityEnabled.value,
-              onChanged: (bool value) async {
-                activityEnabled.value = value;
-                await ref.read(remoteAlbumProvider.notifier).setActivityStatus(album.id, value);
-              },
-              activeColor: activityEnabled.value ? context.primaryColor : context.themeData.disabledColor,
-              dense: true,
-              title: Text(
-                "comments_and_likes",
-                style: context.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w500),
-              ).t(context: context),
-              subtitle: Text(
-                "let_others_respond",
-                style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
-              ).t(context: context),
-            ),
-          buildSectionTitle("shared_album_section_people_title".t(context: context)),
-          if (isOwner) ...[
-            ListTile(
-              leading: const Icon(Icons.person_add_rounded),
-              title: Text("invite_people".t(context: context)),
-              onTap: () async => addUsers(),
-            ),
-            const Divider(indent: 16),
-          ],
-          buildOwnerInfo(),
-          buildSharedUsersList(),
-        ],
-      ),
-    );
-  }
-}
--- a/mobile/lib/presentation/pages/drift_remote_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_remote_album.page.dart
@@ -200,14 +200,6 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
            context.pop();
            await showEditTitleAndDescription(context);
          },
-          onCreateSharedLink: () async {
-            context.pop();
-            context.pushRoute(SharedLinkEditRoute(albumId: _album.id));
-          },
-          onShowOptions: () {
-            context.pop();
-            context.pushRoute(const DriftAlbumOptionsRoute());
-          },
        );
      },
    );
--- a/mobile/lib/presentation/pages/drift_trash.page.dart
+++ b/mobile/lib/presentation/pages/drift_trash.page.dart
@@ -28,6 +28,7 @@ class DriftTrashPage extends StatelessWidget {
        }),
      ],
      child: Timeline(
+        showStorageIndicator: true,
        appBar: SliverAppBar(
          title: Text('trash'.t(context: context)),
          floating: true,
--- a/mobile/lib/presentation/pages/local_timeline.page.dart
+++ b/mobile/lib/presentation/pages/local_timeline.page.dart
@@ -26,6 +26,7 @@ class LocalTimelinePage extends StatelessWidget {
      child: Timeline(
        appBar: MesmerizingSliverAppBar(title: album.name),
        bottomSheet: const LocalAlbumBottomSheet(),
+        showStorageIndicator: true,
      ),
    );
  }
--- a/mobile/lib/presentation/pages/search/drift_search.page.dart
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -13,7 +13,6 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart';
-import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
@@ -628,12 +627,7 @@ class _SearchResultGrid extends ConsumerWidget {
              return timelineService;
            }),
          ],
-          child: Timeline(
-            key: ValueKey(searchResult.totalAssets),
-            groupBy: GroupAssetsBy.none,
-            appBar: null,
-            bottomSheet: const GeneralBottomSheet(minChildSize: 0.20),
-          ),
+          child: Timeline(key: ValueKey(searchResult.totalAssets), appBar: null, groupBy: GroupAssetsBy.none),
        ),
      ),
    );
--- a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
@@ -46,7 +46,6 @@ class DownloadActionButton extends ConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
    return BaseActionButton(
      iconData: Icons.download,
-      maxWidth: 95,
      label: "download".t(context: context),
      onPressed: () => _onTap(context, ref),
    );
--- a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
@@ -45,7 +45,7 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    return BaseActionButton(
-      maxWidth: 115.0,
+      maxWidth: 100.0,
      iconData: Icons.lock_outline_rounded,
      label: "move_to_locked_folder".t(context: context),
      onPressed: () => _onTap(context, ref),
--- a/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
@@ -43,7 +43,6 @@ class RemoveFromAlbumActionButton extends ConsumerWidget {
      iconData: Icons.remove_circle_outline,
      label: "remove_from_album".t(context: context),
      onPressed: () => _onTap(context, ref),
-      maxWidth: 100,
    );
  }
 }
--- a/mobile/lib/presentation/widgets/album/album_selector.widget.dart
+++ b/mobile/lib/presentation/widgets/album/album_selector.widget.dart
@@ -27,9 +27,8 @@ typedef AlbumSelectorCallback = void Function(RemoteAlbum album);

 class AlbumSelector extends ConsumerStatefulWidget {
  final AlbumSelectorCallback onAlbumSelected;
-  final Function? onKeyboardExpanded;

-  const AlbumSelector({super.key, required this.onAlbumSelected, this.onKeyboardExpanded});
+  const AlbumSelector({super.key, required this.onAlbumSelected});

  @override
  ConsumerState<AlbumSelector> createState() => _AlbumSelectorState();
@@ -53,12 +52,6 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
    searchController.addListener(() {
      onSearch(searchController.text, filterMode);
    });
-
-    searchFocusNode.addListener(() {
-      if (searchFocusNode.hasFocus) {
-        widget.onKeyboardExpanded?.call();
-      }
-    });
  }

  void onSearch(String searchTerm, QuickFilterMode sortMode) {
@@ -587,7 +580,6 @@ class AddToAlbumHeader extends ConsumerWidget {
      }

      ref.read(currentRemoteAlbumProvider.notifier).setAlbum(newAlbum);
-      ref.read(multiSelectProvider.notifier).reset();
      context.pushRoute(RemoteAlbumRoute(album: newAlbum));
    }

--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -147,7 +147,11 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
    // Precache both thumbnail and full image for smooth transitions
    unawaited(
      Future.wait([
-        precacheImage(getThumbnailImageProvider(asset: asset), context, onError: (_, __) {}),
+        precacheImage(
+          getThumbnailImageProvider(asset: asset, size: screenSize),
+          context,
+          onError: (_, __) {},
+        ),
        precacheImage(getFullImageProvider(asset, size: screenSize), context, onError: (_, __) {}),
      ]),
    );
@@ -478,7 +482,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
      width: double.infinity,
      height: double.infinity,
      color: backgroundColor,
-      child: Thumbnail(asset: asset, fit: BoxFit.contain),
+      child: Thumbnail(asset: asset, fit: BoxFit.contain, size: Size(ctx.width, ctx.height)),
    );
  }

@@ -509,7 +513,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
  }

  PhotoViewGalleryPageOptions _imageBuilder(BuildContext ctx, BaseAsset asset) {
-    final size = ctx.sizeData;
+    final size = Size(ctx.width, ctx.height);
    return PhotoViewGalleryPageOptions(
      key: ValueKey(asset.heroTag),
      imageProvider: getFullImageProvider(asset, size: size),
@@ -525,10 +529,10 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
      onTapDown: _onTapDown,
      onLongPressStart: asset.isMotionPhoto ? _onLongPress : null,
      errorBuilder: (_, __, ___) => Container(
-        width: size.width,
-        height: size.height,
+        width: ctx.width,
+        height: ctx.height,
        color: backgroundColor,
-        child: Thumbnail(asset: asset, fit: BoxFit.contain),
+        child: Thumbnail(asset: asset, fit: BoxFit.contain, size: size),
      ),
    );
  }
@@ -558,7 +562,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
          asset: asset,
          image: Image(
            key: ValueKey(asset),
-            image: getFullImageProvider(asset, size: ctx.sizeData),
+            image: getFullImageProvider(asset, size: Size(ctx.width, ctx.height)),
            fit: BoxFit.contain,
            height: ctx.height,
            width: ctx.width,
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -12,7 +12,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permane
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
@@ -22,7 +21,6 @@ import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/she
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
@@ -44,8 +42,8 @@ class AssetDetailBottomSheet extends ConsumerWidget {
    }

    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
+
    final isInLockedView = ref.watch(inLockedViewProvider);
-    final currentAlbum = ref.watch(currentRemoteAlbumProvider);

    final actions = <Widget>[
      const ShareActionButton(source: ActionSource.viewer),
@@ -63,7 +61,6 @@ class AssetDetailBottomSheet extends ConsumerWidget {
        const DeleteLocalActionButton(source: ActionSource.viewer),
        const UploadActionButton(source: ActionSource.timeline),
      ],
-      if (currentAlbum != null) RemoveFromAlbumActionButton(albumId: currentAlbum.id, source: ActionSource.viewer),
    ];

    final lockedViewActions = <Widget>[];
--- a/mobile/lib/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart
@@ -22,13 +22,13 @@ class BaseBottomSheet extends ConsumerStatefulWidget {
    this.slivers,
    this.controller,
    this.initialChildSize = 0.35,
-    double? minChildSize,
+    this.minChildSize = 0.15,
    this.maxChildSize = 0.65,
    this.expand = true,
    this.shouldCloseOnMinExtent = true,
    this.resizeOnScroll = true,
    this.backgroundColor,
-  }) : minChildSize = minChildSize ?? 0.15;
+  });

  @override
  ConsumerState<BaseBottomSheet> createState() => _BaseDraggableScrollableSheetState();
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -6,8 +6,8 @@ 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/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
@@ -25,30 +25,11 @@ import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';

-class GeneralBottomSheet extends ConsumerStatefulWidget {
-  final double? minChildSize;
-  const GeneralBottomSheet({super.key, this.minChildSize});
+class GeneralBottomSheet extends ConsumerWidget {
+  const GeneralBottomSheet({super.key});

  @override
-  ConsumerState<GeneralBottomSheet> createState() => _GeneralBottomSheetState();
-}
-
-class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
-  late DraggableScrollableController sheetController;
-  @override
-  void initState() {
-    super.initState();
-    sheetController = DraggableScrollableController();
-  }
-
-  @override
-  void dispose() {
-    sheetController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
    final multiselect = ref.watch(multiSelectProvider);
    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));

@@ -77,14 +58,8 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
      ref.read(multiSelectProvider.notifier).reset();
    }

-    Future<void> onKeyboardExpand() {
-      return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
-    }
-
    return BaseBottomSheet(
-      controller: sheetController,
      initialChildSize: 0.45,
-      minChildSize: widget.minChildSize,
      maxChildSize: 0.85,
      shouldCloseOnMinExtent: false,
      actions: [
@@ -94,21 +69,26 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
          const ArchiveActionButton(source: ActionSource.timeline),
          const FavoriteActionButton(source: ActionSource.timeline),
          const DownloadActionButton(source: ActionSource.timeline),
-          const EditDateTimeActionButton(source: ActionSource.timeline),
-          const EditLocationActionButton(source: ActionSource.timeline),
-          const MoveToLockFolderActionButton(source: ActionSource.timeline),
-          const StackActionButton(source: ActionSource.timeline),
          isTrashEnable
              ? const TrashActionButton(source: ActionSource.timeline)
              : const DeletePermanentActionButton(source: ActionSource.timeline),
          const DeleteActionButton(source: ActionSource.timeline),
+          if (multiselect.hasLocal || multiselect.hasMerged) ...[
+            const DeleteLocalActionButton(source: ActionSource.timeline),
+          ],
+          const EditDateTimeActionButton(source: ActionSource.timeline),
+          const EditLocationActionButton(source: ActionSource.timeline),
+          const MoveToLockFolderActionButton(source: ActionSource.timeline),
+          const StackActionButton(source: ActionSource.timeline),
+        ],
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(source: ActionSource.timeline),
+          const UploadActionButton(source: ActionSource.timeline),
        ],
-        if (multiselect.hasLocal || multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
-        if (multiselect.hasLocal) const UploadActionButton(source: ActionSource.timeline),
      ],
      slivers: [
        const AddToAlbumHeader(),
-        AlbumSelector(onAlbumSelected: addAssetsToAlbum, onKeyboardExpanded: onKeyboardExpand),
+        AlbumSelector(onAlbumSelected: addAssetsToAlbum),
      ],
    );
  }
--- a/mobile/lib/presentation/widgets/images/image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/image_provider.dart
@@ -4,14 +4,13 @@ import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/presentation/widgets/images/local_image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';

 ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080, 1920)}) {
  // Create new provider and cache it
  final ImageProvider provider;
  if (_shouldUseLocalAsset(asset)) {
    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).localId!;
-    provider = LocalFullImageProvider(id: id, size: size, type: asset.type, updatedAt: asset.updatedAt);
+    provider = LocalFullImageProvider(id: id, name: asset.name, size: size, type: asset.type);
  } else {
    final String assetId;
    if (asset is LocalAsset && asset.hasRemote) {
@@ -27,7 +26,7 @@ ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080
  return provider;
 }

-ImageProvider getThumbnailImageProvider({BaseAsset? asset, String? remoteId, Size size = kThumbnailResolution}) {
+ImageProvider getThumbnailImageProvider({BaseAsset? asset, String? remoteId, Size size = const Size.square(256)}) {
  assert(asset != null || remoteId != null, 'Either asset or remoteId must be provided');

  if (remoteId != null) {
@@ -36,7 +35,7 @@ ImageProvider getThumbnailImageProvider({BaseAsset? asset, String? remoteId, Siz

  if (_shouldUseLocalAsset(asset!)) {
    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).localId!;
-    return LocalThumbProvider(id: id, updatedAt: asset.updatedAt, size: size);
+    return LocalThumbProvider(id: id, updatedAt: asset.updatedAt, name: asset.name, size: size);
  }

  final String assetId;
@@ -53,26 +52,3 @@ ImageProvider getThumbnailImageProvider({BaseAsset? asset, String? remoteId, Siz

 bool _shouldUseLocalAsset(BaseAsset asset) =>
    asset.hasLocal && (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage));
-
-ImageInfo? getCachedImage(ImageProvider key) {
-  ImageInfo? thumbnail;
-  final ImageStreamCompleter? stream = PaintingBinding.instance.imageCache.putIfAbsent(
-    key,
-    () => throw Exception(), // don't bother loading if it isn't cached
-    onError: (_, __) {},
-  );
-
-  if (stream != null) {
-    void listener(ImageInfo info, bool synchronousCall) {
-      thumbnail = info;
-    }
-
-    try {
-      stream.addListener(ImageStreamListener(listener));
-    } finally {
-      stream.removeListener(ImageStreamListener(listener));
-    }
-  }
-
-  return thumbnail;
-}
--- a/mobile/lib/presentation/widgets/images/local_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart
@@ -2,17 +2,15 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:ui';

+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
-import 'package:immich_mobile/extensions/codec_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
-import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
-import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/providers/image/cache/thumbnail_image_cache_manager.dart';
 import 'package:immich_mobile/providers/image/exceptions/image_loading_exception.dart';
@@ -24,12 +22,14 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {

  final String id;
  final DateTime updatedAt;
+  final String name;
  final Size size;

  const LocalThumbProvider({
    required this.id,
    required this.updatedAt,
-    this.size = kThumbnailResolution,
+    required this.name,
+    this.size = const Size.square(kTimelineFixedTileExtent),
    this.cacheManager,
  });

@@ -45,8 +45,10 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
      codec: _codec(key, cache, decode),
      scale: 1.0,
      informationCollector: () => <DiagnosticsNode>[
+        DiagnosticsProperty<ImageProvider>('Image provider', this),
        DiagnosticsProperty<String>('Id', key.id),
        DiagnosticsProperty<DateTime>('Updated at', key.updatedAt),
+        DiagnosticsProperty<String>('Name', key.name),
        DiagnosticsProperty<Size>('Size', key.size),
      ],
    );
@@ -66,7 +68,7 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
    final thumbnailBytes = await _assetMediaRepository.getThumbnail(key.id, size: key.size);
    if (thumbnailBytes == null) {
      PaintingBinding.instance.imageCache.evict(key);
-      throw StateError("Loading thumb for local photo ${key.id} failed");
+      throw StateError("Loading thumb for local photo ${key.name} failed");
    }

    final buffer = await ImmutableBuffer.fromUint8List(thumbnailBytes);
@@ -92,11 +94,11 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
  final StorageRepository _storageRepository = const StorageRepository();

  final String id;
+  final String name;
  final Size size;
  final AssetType type;
-  final DateTime updatedAt; // temporary, only exists to fetch cached thumbnail until local disk cache is removed

-  const LocalFullImageProvider({required this.id, required this.size, required this.type, required this.updatedAt});
+  const LocalFullImageProvider({required this.id, required this.name, required this.size, required this.type});

  @override
  Future<LocalFullImageProvider> obtainKey(ImageConfiguration configuration) {
@@ -105,45 +107,52 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {

  @override
  ImageStreamCompleter loadImage(LocalFullImageProvider key, ImageDecoderCallback decode) {
-    return OneFramePlaceholderImageStreamCompleter(
-      _codec(key, decode),
-      initialImage: getCachedImage(LocalThumbProvider(id: key.id, updatedAt: key.updatedAt)),
-      informationCollector: () => <DiagnosticsNode>[
-        DiagnosticsProperty<String>('Id', key.id),
-        DiagnosticsProperty<DateTime>('Updated at', key.updatedAt),
-        DiagnosticsProperty<Size>('Size', key.size),
-      ],
+    return MultiImageStreamCompleter(
+      codec: _codec(key, decode),
+      scale: 1.0,
+      informationCollector: () sync* {
+        yield ErrorDescription(name);
+      },
    );
  }

  // Streams in each stage of the image as we ask for it
-  Stream<ImageInfo> _codec(LocalFullImageProvider key, ImageDecoderCallback decode) {
+  Stream<Codec> _codec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
    try {
-      return switch (key.type) {
-        AssetType.image => _decodeProgressive(key, decode),
-        AssetType.video => _getThumbnailCodec(key, decode),
-        _ => throw StateError('Unsupported asset type ${key.type}'),
-      };
+      switch (key.type) {
+        case AssetType.image:
+          yield* _decodeProgressive(key, decode);
+          break;
+        case AssetType.video:
+          final codec = await _getThumbnailCodec(key, decode);
+          if (codec == null) {
+            throw StateError("Failed to load preview for ${key.name}");
+          }
+          yield codec;
+          break;
+        case AssetType.other:
+        case AssetType.audio:
+          throw StateError('Unsupported asset type ${key.type}');
+      }
    } catch (error, stack) {
-      Logger('ImmichLocalImageProvider').severe('Error loading local image ${key.id}', error, stack);
+      Logger('ImmichLocalImageProvider').severe('Error loading local image ${key.name}', error, stack);
      throw const ImageLoadingException('Could not load image from local storage');
    }
  }

-  Stream<ImageInfo> _getThumbnailCodec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
+  Future<Codec?> _getThumbnailCodec(LocalFullImageProvider key, ImageDecoderCallback decode) async {
    final thumbBytes = await _assetMediaRepository.getThumbnail(key.id, size: key.size);
    if (thumbBytes == null) {
-      throw StateError("Failed to load preview for ${key.id}");
+      return null;
    }
    final buffer = await ImmutableBuffer.fromUint8List(thumbBytes);
-    final codec = await decode(buffer);
-    yield await codec.getImageInfo();
+    return decode(buffer);
  }

-  Stream<ImageInfo> _decodeProgressive(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
+  Stream<Codec> _decodeProgressive(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
    final file = await _storageRepository.getFileForAsset(key.id);
    if (file == null) {
-      throw StateError("Opening file for asset ${key.id} failed");
+      throw StateError("Opening file for asset ${key.name} failed");
    }

    final fileSize = await file.length();
@@ -162,8 +171,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
        final mediumThumb = await _assetMediaRepository.getThumbnail(key.id, size: size);
        if (mediumThumb != null) {
          final mediumBuffer = await ImmutableBuffer.fromUint8List(mediumThumb);
-          final codec = await decode(mediumBuffer);
-          yield await codec.getImageInfo();
+          yield await decode(mediumBuffer);
        }
      } catch (_) {}
    }
@@ -179,26 +187,24 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
      final highThumb = await _assetMediaRepository.getThumbnail(key.id, size: size);
      if (highThumb != null) {
        final highBuffer = await ImmutableBuffer.fromUint8List(highThumb);
-        final codec = await decode(highBuffer);
-        yield await codec.getImageInfo();
+        yield await decode(highBuffer);
      }
      return;
    }

    final buffer = await ImmutableBuffer.fromFilePath(file.path);
-    final codec = await decode(buffer);
-    yield await codec.getImageInfo();
+    yield await decode(buffer);
  }

  @override
  bool operator ==(Object other) {
    if (identical(this, other)) return true;
    if (other is LocalFullImageProvider) {
-      return id == other.id && size == other.size && type == other.type;
+      return id == other.id && size == other.size && type == other.type && name == other.name;
    }
    return false;
  }

  @override
-  int get hashCode => id.hashCode ^ size.hashCode ^ type.hashCode;
+  int get hashCode => id.hashCode ^ size.hashCode ^ type.hashCode ^ name.hashCode;
 }
--- a/mobile/lib/presentation/widgets/images/one_frame_multi_image_stream_completer.dart
+++ b/mobile/lib/presentation/widgets/images/one_frame_multi_image_stream_completer.dart
@@ -1,67 +0,0 @@
-// The below code is adapted from cached_network_image package's
-// MultiImageStreamCompleter to better suit one-frame image loading.
-// In particular, it allows providing an initial image to emit synchronously.
-
-import 'dart:async';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/painting.dart';
-
-/// An ImageStreamCompleter with support for loading multiple images.
-class OneFramePlaceholderImageStreamCompleter extends ImageStreamCompleter {
-  ImageInfo? _initialImage;
-
-  /// The constructor to create an OneFramePlaceholderImageStreamCompleter. The [images]
-  /// should be the primary images to display (typically asynchronously as they load).
-  /// The [initialImage] is an optional image that will be emitted synchronously
-  /// until the first stream image is completed, useful as a thumbnail or placeholder.
-  OneFramePlaceholderImageStreamCompleter(
-    Stream<ImageInfo> images, {
-    ImageInfo? initialImage,
-    InformationCollector? informationCollector,
-  }) {
-    _initialImage = initialImage;
-    images.listen(
-      _onImage,
-      onError: (Object error, StackTrace stack) {
-        reportError(
-          context: ErrorDescription('resolving a single-frame image stream'),
-          exception: error,
-          stack: stack,
-          informationCollector: informationCollector,
-          silent: true,
-        );
-      },
-    );
-  }
-
-  void _onImage(ImageInfo image) {
-    setImage(image);
-    _initialImage?.dispose();
-    _initialImage = null;
-  }
-
-  @override
-  void addListener(ImageStreamListener listener) {
-    final initialImage = _initialImage;
-    if (initialImage != null) {
-      try {
-        listener.onImage(initialImage.clone(), true);
-      } catch (exception, stack) {
-        reportError(
-          context: ErrorDescription('by a synchronously-called image listener'),
-          exception: exception,
-          stack: stack,
-        );
-      }
-    }
-    super.addListener(listener);
-  }
-
-  @override
-  void onDisposed() {
-    _initialImage?.dispose();
-    _initialImage = null;
-    super.onDisposed();
-  }
-}
--- a/mobile/lib/presentation/widgets/images/remote_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/remote_image_provider.dart
@@ -1,14 +1,12 @@
 import 'dart:async';
 import 'dart:ui';

+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
-import 'package:immich_mobile/extensions/codec_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
-import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
 import 'package:immich_mobile/providers/image/cache/image_loader.dart';
 import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
@@ -83,28 +81,36 @@ class RemoteFullImageProvider extends ImageProvider<RemoteFullImageProvider> {
  @override
  ImageStreamCompleter loadImage(RemoteFullImageProvider key, ImageDecoderCallback decode) {
    final cache = cacheManager ?? RemoteImageCacheManager();
-    return OneFramePlaceholderImageStreamCompleter(
-      _codec(key, cache, decode),
-      initialImage: getCachedImage(RemoteThumbProvider(assetId: key.assetId)),
+    final chunkEvents = StreamController<ImageChunkEvent>();
+    return MultiImageStreamCompleter(
+      codec: _codec(key, cache, decode, chunkEvents),
+      scale: 1.0,
+      chunkEvents: chunkEvents.stream,
    );
  }

-  Stream<ImageInfo> _codec(RemoteFullImageProvider key, CacheManager cache, ImageDecoderCallback decode) async* {
-    final codec = await ImageLoader.loadImageFromCache(
+  Stream<Codec> _codec(
+    RemoteFullImageProvider key,
+    CacheManager cache,
+    ImageDecoderCallback decode,
+    StreamController<ImageChunkEvent> chunkController,
+  ) async* {
+    yield await ImageLoader.loadImageFromCache(
      getPreviewUrlForRemoteId(key.assetId),
      cache: cache,
      decode: decode,
+      chunkEvents: chunkController,
    );
-    yield await codec.getImageInfo();

    if (AppSetting.get(Setting.loadOriginal)) {
-      final codec = await ImageLoader.loadImageFromCache(
+      yield await ImageLoader.loadImageFromCache(
        getOriginalUrlForRemoteId(key.assetId),
        cache: cache,
        decode: decode,
+        chunkEvents: chunkController,
      );
-      yield await codec.getImageInfo();
    }
+    await chunkController.close();
  }

  @override
--- a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
@@ -19,7 +19,7 @@ class Thumbnail extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final thumbHash = asset is RemoteAsset ? (asset as RemoteAsset).thumbHash : null;
-    final provider = getThumbnailImageProvider(asset: asset, remoteId: remoteId);
+    final provider = getThumbnailImageProvider(asset: asset, remoteId: remoteId, size: size);

    return OctoImage.fromSet(
      image: provider,
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -2,12 +2,10 @@ import 'package:auto_route/auto_route.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/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/theme_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';

 class ThumbnailTile extends ConsumerWidget {
@@ -15,7 +13,7 @@ class ThumbnailTile extends ConsumerWidget {
    this.asset, {
    this.size = const Size.square(256),
    this.fit = BoxFit.cover,
-    this.showStorageIndicator,
+    this.showStorageIndicator = true,
    this.lockSelection = false,
    this.heroOffset,
    super.key,
@@ -24,7 +22,7 @@ class ThumbnailTile extends ConsumerWidget {
  final BaseAsset asset;
  final Size size;
  final BoxFit fit;
-  final bool? showStorageIndicator;
+  final bool showStorageIndicator;
  final bool lockSelection;
  final int? heroOffset;

@@ -54,9 +52,6 @@ class ThumbnailTile extends ConsumerWidget {

    final hasStack = asset is RemoteAsset && (asset as RemoteAsset).stackId != null;

-    final bool storageIndicator =
-        showStorageIndicator ?? ref.watch(settingsProvider.select((s) => s.get(Setting.showStorageIndicator)));
-
    return Stack(
      children: [
        AnimatedContainer(
@@ -91,7 +86,7 @@ class ThumbnailTile extends ConsumerWidget {
                      child: _VideoIndicator(asset.duration),
                    ),
                  ),
-                if (storageIndicator)
+                if (showStorageIndicator)
                  switch (asset.storage) {
                    AssetState.local => const Align(
                      alignment: Alignment.bottomRight,
--- a/mobile/lib/presentation/widgets/remote_album/drift_album_option.widget.dart
+++ b/mobile/lib/presentation/widgets/remote_album/drift_album_option.widget.dart
@@ -13,7 +13,6 @@ class DriftRemoteAlbumOption extends ConsumerWidget {
    this.onCreateSharedLink,
    this.onToggleAlbumOrder,
    this.onEditAlbum,
-    this.onShowOptions,
  });

  final VoidCallback? onAddPhotos;
@@ -23,7 +22,6 @@ class DriftRemoteAlbumOption extends ConsumerWidget {
  final VoidCallback? onCreateSharedLink;
  final VoidCallback? onToggleAlbumOrder;
  final VoidCallback? onEditAlbum;
-  final VoidCallback? onShowOptions;

  @override
  Widget build(BuildContext context, WidgetRef ref) {
@@ -71,12 +69,6 @@ class DriftRemoteAlbumOption extends ConsumerWidget {
                title: Text('create_shared_link'.t(context: context), style: textStyle),
                onTap: onCreateSharedLink,
              ),
-            if (onShowOptions != null)
-              ListTile(
-                leading: const Icon(Icons.settings),
-                title: Text('options'.t(context: context), style: textStyle),
-                onTap: onShowOptions,
-              ),
            if (onDeleteAlbum != null) ...[
              const Divider(indent: 16, endIndent: 16),
              ListTile(
--- a/mobile/lib/presentation/widgets/timeline/constants.dart
+++ b/mobile/lib/presentation/widgets/timeline/constants.dart
@@ -1,8 +1,5 @@
-import 'dart:ui';
-
 const double kTimelineHeaderExtent = 80.0;
-const Size kTimelineFixedTileExtent = Size.square(256);
-const Size kThumbnailResolution = kTimelineFixedTileExtent;
+const double kTimelineFixedTileExtent = 256;
 const double kTimelineSpacing = 2.0;
 const int kTimelineColumnCount = 3;

--- a/mobile/lib/presentation/widgets/timeline/segment_builder.dart
+++ b/mobile/lib/presentation/widgets/timeline/segment_builder.dart
@@ -21,7 +21,7 @@ abstract class SegmentBuilder {
  static Widget buildPlaceholder(
    BuildContext context,
    int count, {
-    Size size = kTimelineFixedTileExtent,
+    Size size = const Size.square(kTimelineFixedTileExtent),
    double spacing = kTimelineSpacing,
  }) => RepaintBoundary(
    child: FixedTimelineRow(
--- a/mobile/lib/presentation/widgets/timeline/timeline.state.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
@@ -14,7 +14,7 @@ class TimelineArgs {
  final double maxHeight;
  final double spacing;
  final int columnCount;
-  final bool? showStorageIndicator;
+  final bool showStorageIndicator;
  final bool withStack;
  final GroupAssetsBy? groupBy;

@@ -23,7 +23,7 @@ class TimelineArgs {
    required this.maxHeight,
    this.spacing = kTimelineSpacing,
    this.columnCount = kTimelineColumnCount,
-    this.showStorageIndicator,
+    this.showStorageIndicator = false,
    this.withStack = false,
    this.groupBy,
  });
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -31,7 +31,7 @@ class Timeline extends StatelessWidget {
    super.key,
    this.topSliverWidget,
    this.topSliverWidgetHeight,
-    this.showStorageIndicator,
+    this.showStorageIndicator = false,
    this.withStack = false,
    this.appBar = const ImmichSliverAppBar(floating: true, pinned: false, snap: false),
    this.bottomSheet = const GeneralBottomSheet(),
@@ -40,7 +40,7 @@ class Timeline extends StatelessWidget {

  final Widget? topSliverWidget;
  final double? topSliverWidgetHeight;
-  final bool? showStorageIndicator;
+  final bool showStorageIndicator;
  final Widget? appBar;
  final Widget? bottomSheet;
  final bool withStack;
@@ -115,8 +115,6 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
        _baseScaleFactor = _scaleFactor;
      });
    });
-
-    ref.listenManual(multiSelectProvider.select((s) => s.isEnabled), _onMultiSelectionToggled);
  }

  void _onEvent(Event event) {
@@ -132,10 +130,6 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
    }
  }

-  void _onMultiSelectionToggled(_, bool isEnabled) {
-    EventStream.shared.emit(MultiSelectToggleEvent(isEnabled));
-  }
-
  @override
  void dispose() {
    _scrollController.dispose();
--- a/mobile/lib/providers/app_life_cycle.provider.dart
+++ b/mobile/lib/providers/app_life_cycle.provider.dart
@@ -22,7 +22,7 @@ import 'package:immich_mobile/providers/tab.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/services/backgroundLegacy.service.dart';
+import 'package:immich_mobile/services/background.service.dart';
 import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
 import 'package:permission_handler/permission_handler.dart';
@@ -86,12 +86,11 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
      // Ensure proper cleanup before starting new background tasks
      try {
        await Future.wait([
-          Future(() async {
-            await backgroundManager.syncLocal();
+          backgroundManager.syncLocal().then((_) {
            Logger("AppLifeCycleNotifier").fine("Hashing assets after syncLocal");
            // Check if app is still active before hashing
-            if ([AppLifeCycleEnum.resumed, AppLifeCycleEnum.active].contains(state)) {
-              await backgroundManager.hashAssets();
+            if (state == AppLifeCycleEnum.resumed) {
+              backgroundManager.hashAssets();
            }
          }),
          backgroundManager.syncRemote(),
--- a/mobile/lib/providers/auth.provider.dart
+++ b/mobile/lib/providers/auth.provider.dart
@@ -121,9 +121,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
  Future<bool> saveAuthInfo({required String accessToken}) async {
    await _apiService.setAccessToken(accessToken);

-    final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-    final customHeaders = Store.tryGet(StoreKey.customHeaders);
-    await _widgetService.writeCredentials(serverEndpoint, accessToken, customHeaders);
+    await _widgetService.writeCredentials(Store.get(StoreKey.serverEndpoint), accessToken);

    // Get the deviceid from the store if it exists, otherwise generate a new one
    String deviceId = Store.tryGet(StoreKey.deviceId) ?? await FlutterUdid.consistentUdid;
--- a/mobile/lib/providers/backup/backup.provider.dart
+++ b/mobile/lib/providers/backup/backup.provider.dart
@@ -24,7 +24,7 @@ import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/backup.repository.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
-import 'package:immich_mobile/services/backgroundLegacy.service.dart';
+import 'package:immich_mobile/services/background.service.dart';
 import 'package:immich_mobile/services/backup.service.dart';
 import 'package:immich_mobile/services/backup_album.service.dart';
 import 'package:immich_mobile/services/server_info.service.dart';
--- a/mobile/lib/providers/backup/ios_background_settings.provider.dart
+++ b/mobile/lib/providers/backup/ios_background_settings.provider.dart
@@ -1,5 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/services/backgroundLegacy.service.dart';
+import 'package:immich_mobile/services/background.service.dart';

 class IOSBackgroundSettings {
  final bool appRefreshEnabled;
--- a/mobile/lib/providers/backup/manual_upload.provider.dart
+++ b/mobile/lib/providers/backup/manual_upload.provider.dart
@@ -21,7 +21,7 @@ import 'package:immich_mobile/providers/backup/error_backup_list.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/services/backgroundLegacy.service.dart';
+import 'package:immich_mobile/services/background.service.dart';
 import 'package:immich_mobile/services/backup.service.dart';
 import 'package:immich_mobile/services/backup_album.service.dart';
 import 'package:immich_mobile/services/local_notification.service.dart';
--- a/mobile/lib/providers/infrastructure/remote_album.provider.dart
+++ b/mobile/lib/providers/infrastructure/remote_album.provider.dart
@@ -156,23 +156,6 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
  Future<void> addUsers(String albumId, List<String> userIds) {
    return _remoteAlbumService.addUsers(albumId: albumId, userIds: userIds);
  }
-
-  Future<void> removeUser(String albumId, String userId) {
-    return _remoteAlbumService.removeUser(albumId, userId: userId);
-  }
-
-  Future<void> leaveAlbum(String albumId, {required String userId}) async {
-    await _remoteAlbumService.removeUser(albumId, userId: userId);
-
-    final updatedAlbums = state.albums.where((album) => album.id != albumId).toList();
-    final updatedFilteredAlbums = state.filteredAlbums.where((album) => album.id != albumId).toList();
-
-    state = state.copyWith(albums: updatedAlbums, filteredAlbums: updatedFilteredAlbums);
-  }
-
-  Future<void> setActivityStatus(String albumId, bool enabled) {
-    return _remoteAlbumService.setActivityStatus(albumId, enabled);
-  }
 }

 final remoteAlbumDateRangeProvider = FutureProvider.family<(DateTime, DateTime), String>((ref, albumId) async {
--- a/mobile/lib/providers/timeline/multiselect.provider.dart
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -1,8 +1,8 @@
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';

 final multiSelectProvider = NotifierProvider<MultiSelectNotifier, MultiSelectState>(
@@ -10,11 +10,6 @@ final multiSelectProvider = NotifierProvider<MultiSelectNotifier, MultiSelectSta
  dependencies: [timelineServiceProvider],
 );

-class MultiSelectToggleEvent extends Event {
-  final bool isEnabled;
-  const MultiSelectToggleEvent(this.isEnabled);
-}
-
 class MultiSelectState {
  final Set<BaseAsset> selectedAssets;
  final Set<BaseAsset> lockedSelectionAssets;
--- a/mobile/lib/repositories/auth_api.repository.dart
+++ b/mobile/lib/repositories/auth_api.repository.dart
@@ -25,8 +25,6 @@ class AuthApiRepository extends ApiRepository {
  }

  Future<void> logout() async {
-    if (_apiService.apiClient.basePath.isEmpty) return;
-
    await _apiService.authenticationApi.logout().timeout(const Duration(seconds: 7));
  }

--- a/mobile/lib/repositories/drift_album_api_repository.dart
+++ b/mobile/lib/repositories/drift_album_api_repository.dart
@@ -87,15 +87,6 @@ class DriftAlbumApiRepository extends ApiRepository {
    final response = await checkNull(_api.addUsersToAlbum(albumId, AddUsersDto(albumUsers: albumUsers)));
    return response.toRemoteAlbum();
  }
-
-  Future<void> removeUser(String albumId, {required String userId}) async {
-    await _api.removeUserFromAlbum(albumId, userId);
-  }
-
-  Future<bool> setActivityStatus(String albumId, bool isEnabled) async {
-    final response = await checkNull(_api.updateAlbumInfo(albumId, UpdateAlbumDto(isActivityEnabled: isEnabled)));
-    return response.isActivityEnabled;
-  }
 }

 extension on AlbumResponseDto {
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -23,11 +23,11 @@ import 'package:immich_mobile/pages/album/album_shared_user_selection.page.dart'
 import 'package:immich_mobile/pages/album/album_viewer.page.dart';
 import 'package:immich_mobile/pages/albums/albums.page.dart';
 import 'package:immich_mobile/pages/backup/album_preview.page.dart';
+import 'package:immich_mobile/pages/backup/drift_backup_album_selection.page.dart';
+import 'package:immich_mobile/pages/backup/drift_backup.page.dart';
 import 'package:immich_mobile/pages/backup/backup_album_selection.page.dart';
 import 'package:immich_mobile/pages/backup/backup_controller.page.dart';
 import 'package:immich_mobile/pages/backup/backup_options.page.dart';
-import 'package:immich_mobile/pages/backup/drift_backup.page.dart';
-import 'package:immich_mobile/pages/backup/drift_backup_album_selection.page.dart';
 import 'package:immich_mobile/pages/backup/drift_backup_options.page.dart';
 import 'package:immich_mobile/pages/backup/drift_upload_detail.page.dart';
 import 'package:immich_mobile/pages/backup/failed_backup_status.page.dart';
@@ -81,7 +81,6 @@ import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.da
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_album_options.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_archive.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_asset_selection_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_create_album.page.dart';
@@ -96,9 +95,9 @@ import 'package:immich_mobile/presentation/pages/drift_person.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_place.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_place_detail.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_recently_taken.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_user_selection.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_remote_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_trash.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_user_selection.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_video.page.dart';
 import 'package:immich_mobile/presentation/pages/local_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/search/drift_search.page.dart';
@@ -330,7 +329,6 @@ class AppRouter extends RootStackRouter {
    AutoRoute(page: DriftPeopleCollectionRoute.page, guards: [_authGuard, _duplicateGuard]),
    AutoRoute(page: DriftPersonRoute.page, guards: [_authGuard]),
    AutoRoute(page: DriftBackupOptionsRoute.page, guards: [_authGuard, _duplicateGuard]),
-    AutoRoute(page: DriftAlbumOptionsRoute.page, guards: [_authGuard, _duplicateGuard]),
    // required to handle all deeplinks in deep_link.service.dart
    // auto_route_library#1722
    RedirectRoute(path: '*', redirectTo: '/'),
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -667,22 +667,6 @@ class CropImageRouteArgs {
  }
 }

-/// generated route for
-/// [DriftAlbumOptionsPage]
-class DriftAlbumOptionsRoute extends PageRouteInfo<void> {
-  const DriftAlbumOptionsRoute({List<PageRouteInfo>? children})
-    : super(DriftAlbumOptionsRoute.name, initialChildren: children);
-
-  static const String name = 'DriftAlbumOptionsRoute';
-
-  static PageInfo page = PageInfo(
-    name,
-    builder: (data) {
-      return const DriftAlbumOptionsPage();
-    },
-  );
-}
-
 /// generated route for
 /// [DriftAlbumsPage]
 class DriftAlbumsRoute extends PageRouteInfo<void> {
--- a/mobile/lib/services/backgroundLegacy.service.dart
+++ b/mobile/lib/services/backgroundLegacy.service.dart
--- a/mobile/lib/services/hash.service.dart
+++ b/mobile/lib/services/hash.service.dart
@@ -8,7 +8,7 @@ import 'package:immich_mobile/domain/models/device_asset.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/device_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/device_asset.provider.dart';
-import 'package:immich_mobile/services/backgroundLegacy.service.dart';
+import 'package:immich_mobile/services/background.service.dart';
 import 'package:logging/logging.dart';

 class HashService {
--- a/mobile/lib/services/widget.service.dart
+++ b/mobile/lib/services/widget.service.dart
@@ -11,15 +11,11 @@ class WidgetService {

  const WidgetService(this._repository);

-  Future<void> writeCredentials(String serverURL, String sessionKey, String? customHeaders) async {
+  Future<void> writeCredentials(String serverURL, String sessionKey) async {
    await _repository.setAppGroupId(appShareGroupId);
    await _repository.saveData(kWidgetServerEndpoint, serverURL);
    await _repository.saveData(kWidgetAuthToken, sessionKey);

-    if (customHeaders != null && customHeaders.isNotEmpty) {
-      await _repository.saveData(kWidgetCustomHeaders, customHeaders);
-    }
-
    // wait 3 seconds to ensure the widget is updated, dont block
    Future.delayed(const Duration(seconds: 3), refreshWidgets);
  }
@@ -28,7 +24,6 @@ class WidgetService {
    await _repository.setAppGroupId(appShareGroupId);
    await _repository.saveData(kWidgetServerEndpoint, "");
    await _repository.saveData(kWidgetAuthToken, "");
-    await _repository.saveData(kWidgetCustomHeaders, "");

    // wait 3 seconds to ensure the widget is updated, dont block
    Future.delayed(const Duration(seconds: 3), refreshWidgets);
--- a/mobile/lib/widgets/album/remote_album_shared_user_icons.dart
+++ b/mobile/lib/widgets/album/remote_album_shared_user_icons.dart
@@ -1,9 +1,7 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';

 class RemoteAlbumSharedUserIcons extends ConsumerWidget {
@@ -24,20 +22,17 @@ class RemoteAlbumSharedUserIcons extends ConsumerWidget {
          return const SizedBox();
        }

-        return GestureDetector(
-          onTap: () => context.pushRoute(const DriftAlbumOptionsRoute()),
-          child: SizedBox(
-            height: 50,
-            child: ListView.builder(
-              scrollDirection: Axis.horizontal,
-              itemBuilder: ((context, index) {
-                return Padding(
-                  padding: const EdgeInsets.only(right: 4.0),
-                  child: UserCircleAvatar(user: sharedUsers[index], radius: 18, size: 36, hasBorder: true),
-                );
-              }),
-              itemCount: sharedUsers.length,
-            ),
+        return SizedBox(
+          height: 50,
+          child: ListView.builder(
+            scrollDirection: Axis.horizontal,
+            itemBuilder: ((context, index) {
+              return Padding(
+                padding: const EdgeInsets.only(right: 4.0),
+                child: UserCircleAvatar(user: sharedUsers[index], radius: 18, size: 36, hasBorder: true),
+              );
+            }),
+            itemCount: sharedUsers.length,
          ),
        );
      },
--- a/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:ui';

-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -19,7 +18,6 @@ import 'package:immich_mobile/providers/infrastructure/current_album.provider.da
 import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/album/remote_album_shared_user_icons.dart';

 class RemoteAlbumSliverAppBar extends ConsumerStatefulWidget {
@@ -95,7 +93,7 @@ class _MesmerizingSliverAppBarState extends ConsumerState<RemoteAlbumSliverAppBa
              ),
              onPressed: () {
                ref.read(remoteAlbumProvider.notifier).refresh();
-                context.navigateTo(const TabShellRoute(children: [DriftAlbumsRoute()]));
+                context.pop();
              },
            ),
            actions: [
--- a/mobile/lib/widgets/common/selection_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/selection_sliver_app_bar.dart
@@ -1,3 +1,4 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -25,7 +26,7 @@ class _SelectionSliverAppBarState extends ConsumerState<SelectionSliverAppBar> {

    onDone(Set<BaseAsset> selected) {
      ref.read(multiSelectProvider.notifier).reset();
-      context.pop<Set<BaseAsset>>(selected);
+      context.maybePop<Set<BaseAsset>>(selected);
    }

    return SliverAppBar(
--- a/mobile/lib/widgets/map/map_asset_grid.dart
+++ b/mobile/lib/widgets/map/map_asset_grid.dart
@@ -8,7 +8,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/collection_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/map/map_event.model.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/timeline.provider.dart';
@@ -230,7 +229,9 @@ class _MapSheetDragRegion extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    final assetsInBoundsText = "map_assets_in_bounds".t(context: context, args: {'count': assetsInBoundCount});
+    final assetsInBoundsText = assetsInBoundCount > 0
+        ? "map_assets_in_bounds".tr(namedArgs: {'count': assetsInBoundCount.toString()})
+        : "map_no_assets_in_bounds".tr();

    return SingleChildScrollView(
      controller: controller,
--- a/mobile/lib/widgets/settings/asset_list_settings/asset_list_settings.dart
+++ b/mobile/lib/widgets/settings/asset_list_settings/asset_list_settings.dart
@@ -2,13 +2,11 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_group_settings.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
-
+import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 import 'asset_list_layout_settings.dart';

 class AssetListSettings extends HookConsumerWidget {
@@ -22,10 +20,7 @@ class AssetListSettings extends HookConsumerWidget {
      SettingsSwitchListTile(
        valueNotifier: showStorageIndicator,
        title: 'theme_setting_asset_list_storage_indicator_title'.tr(),
-        onChanged: (_) {
-          ref.invalidate(appSettingsServiceProvider);
-          ref.invalidate(settingsProvider);
-        },
+        onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
      ),
      const LayoutSettings(),
      const GroupSettings(),
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -3,7 +3,7 @@ Immich API

 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:

- API version: 1.137.3
+- API version: 1.137.2
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen

--- a/mobile/openapi/lib/api/server_api.dart
+++ b/mobile/openapi/lib/api/server_api.dart
@@ -477,9 +477,7 @@ class ServerApi {
    return null;
  }

-  /// This endpoint requires the `server.versionCheck` permission.
-  ///
-  /// Note: This method returns the HTTP [Response].
+  /// Performs an HTTP 'GET /server/version-check' operation and returns the [Response].
  Future<Response> getVersionCheckWithHttpInfo() async {
    // ignore: prefer_const_declarations
    final apiPath = r'/server/version-check';
@@ -505,7 +503,6 @@ class ServerApi {
    );
  }

-  /// This endpoint requires the `server.versionCheck` permission.
  Future<VersionCheckStateResponseDto?> getVersionCheck() async {
    final response = await getVersionCheckWithHttpInfo();
    if (response.statusCode >= HttpStatus.badRequest) {
--- a/mobile/openapi/lib/model/permission.dart
+++ b/mobile/openapi/lib/model/permission.dart
@@ -101,7 +101,6 @@ class Permission {
  static const serverPeriodApkLinks = Permission._(r'server.apkLinks');
  static const serverPeriodStorage = Permission._(r'server.storage');
  static const serverPeriodStatistics = Permission._(r'server.statistics');
-  static const serverPeriodVersionCheck = Permission._(r'server.versionCheck');
  static const serverLicensePeriodRead = Permission._(r'serverLicense.read');
  static const serverLicensePeriodUpdate = Permission._(r'serverLicense.update');
  static const serverLicensePeriodDelete = Permission._(r'serverLicense.delete');
@@ -231,7 +230,6 @@ class Permission {
    serverPeriodApkLinks,
    serverPeriodStorage,
    serverPeriodStatistics,
-    serverPeriodVersionCheck,
    serverLicensePeriodRead,
    serverLicensePeriodUpdate,
    serverLicensePeriodDelete,
@@ -396,7 +394,6 @@ class PermissionTypeTransformer {
        case r'server.apkLinks': return Permission.serverPeriodApkLinks;
        case r'server.storage': return Permission.serverPeriodStorage;
        case r'server.statistics': return Permission.serverPeriodStatistics;
-        case r'server.versionCheck': return Permission.serverPeriodVersionCheck;
        case r'serverLicense.read': return Permission.serverLicensePeriodRead;
        case r'serverLicense.update': return Permission.serverLicensePeriodUpdate;
        case r'serverLicense.delete': return Permission.serverLicensePeriodDelete;
--- a/mobile/openapi/lib/model/sync_entity_type.dart
+++ b/mobile/openapi/lib/model/sync_entity_type.dart
@@ -44,11 +44,9 @@ class SyncEntityType {
  static const albumUserV1 = SyncEntityType._(r'AlbumUserV1');
  static const albumUserBackfillV1 = SyncEntityType._(r'AlbumUserBackfillV1');
  static const albumUserDeleteV1 = SyncEntityType._(r'AlbumUserDeleteV1');
-  static const albumAssetCreateV1 = SyncEntityType._(r'AlbumAssetCreateV1');
-  static const albumAssetUpdateV1 = SyncEntityType._(r'AlbumAssetUpdateV1');
+  static const albumAssetV1 = SyncEntityType._(r'AlbumAssetV1');
  static const albumAssetBackfillV1 = SyncEntityType._(r'AlbumAssetBackfillV1');
-  static const albumAssetExifCreateV1 = SyncEntityType._(r'AlbumAssetExifCreateV1');
-  static const albumAssetExifUpdateV1 = SyncEntityType._(r'AlbumAssetExifUpdateV1');
+  static const albumAssetExifV1 = SyncEntityType._(r'AlbumAssetExifV1');
  static const albumAssetExifBackfillV1 = SyncEntityType._(r'AlbumAssetExifBackfillV1');
  static const albumToAssetV1 = SyncEntityType._(r'AlbumToAssetV1');
  static const albumToAssetDeleteV1 = SyncEntityType._(r'AlbumToAssetDeleteV1');
@@ -91,11 +89,9 @@ class SyncEntityType {
    albumUserV1,
    albumUserBackfillV1,
    albumUserDeleteV1,
-    albumAssetCreateV1,
-    albumAssetUpdateV1,
+    albumAssetV1,
    albumAssetBackfillV1,
-    albumAssetExifCreateV1,
-    albumAssetExifUpdateV1,
+    albumAssetExifV1,
    albumAssetExifBackfillV1,
    albumToAssetV1,
    albumToAssetDeleteV1,
@@ -173,11 +169,9 @@ class SyncEntityTypeTypeTransformer {
        case r'AlbumUserV1': return SyncEntityType.albumUserV1;
        case r'AlbumUserBackfillV1': return SyncEntityType.albumUserBackfillV1;
        case r'AlbumUserDeleteV1': return SyncEntityType.albumUserDeleteV1;
-        case r'AlbumAssetCreateV1': return SyncEntityType.albumAssetCreateV1;
-        case r'AlbumAssetUpdateV1': return SyncEntityType.albumAssetUpdateV1;
+        case r'AlbumAssetV1': return SyncEntityType.albumAssetV1;
        case r'AlbumAssetBackfillV1': return SyncEntityType.albumAssetBackfillV1;
-        case r'AlbumAssetExifCreateV1': return SyncEntityType.albumAssetExifCreateV1;
-        case r'AlbumAssetExifUpdateV1': return SyncEntityType.albumAssetExifUpdateV1;
+        case r'AlbumAssetExifV1': return SyncEntityType.albumAssetExifV1;
        case r'AlbumAssetExifBackfillV1': return SyncEntityType.albumAssetExifBackfillV1;
        case r'AlbumToAssetV1': return SyncEntityType.albumToAssetV1;
        case r'AlbumToAssetDeleteV1': return SyncEntityType.albumToAssetDeleteV1;
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -1416,10 +1416,10 @@ packages:
    dependency: "direct dev"
    description:
      name: pigeon
-      sha256: b65acb352dc5a5f8615d074a83419388cbcc249f07c6d8c78b5bc16680a55dda
+      sha256: a093af76026160bb5ff6eb98e3e678a301ffd1001ac0d90be558bc133a0c73f5
      url: "https://pub.dev"
    source: hosted
-    version: "26.0.0"
+    version: "25.3.2"
  pinput:
    dependency: "direct main"
    description:
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone

 publish_to: 'none'
-version: 1.137.3+3002
+version: 1.137.2+3002

 environment:
  sdk: '>=3.8.0 <4.0.0'
@@ -116,7 +116,7 @@ dev_dependencies:
  # Drift generator
  drift_dev: ^2.23.1
  # Type safe platform code
-  pigeon: ^26.0.0
+  pigeon: ^25.3.1

 flutter:
  uses-material-design: true
--- a/mobile/test/service.mocks.dart
+++ b/mobile/test/service.mocks.dart
@@ -1,7 +1,7 @@
 import 'package:immich_mobile/services/album.service.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/services/backgroundLegacy.service.dart';
+import 'package:immich_mobile/services/background.service.dart';
 import 'package:immich_mobile/services/backup.service.dart';
 import 'package:immich_mobile/services/entity.service.dart';
 import 'package:immich_mobile/services/hash.service.dart';
--- a/mobile/test/services/hash_service_test.dart
+++ b/mobile/test/services/hash_service_test.dart
@@ -9,7 +9,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/models/device_asset.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/device_asset.repository.dart';
-import 'package:immich_mobile/services/backgroundLegacy.service.dart';
+import 'package:immich_mobile/services/background.service.dart';
 import 'package:immich_mobile/services/hash.service.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:photo_manager/photo_manager.dart';
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -6506,9 +6506,7 @@
        ],
        "tags": [
          "Server"
-        ],
-        "x-immich-permission": "server.versionCheck",
-        "description": "This endpoint requires the `server.versionCheck` permission."
+        ]
      }
    },
    "/server/version-history": {
@@ -9471,7 +9469,7 @@
  "info": {
    "title": "Immich",
    "description": "Immich API",
-    "version": "1.137.3",
+    "version": "1.137.2",
    "contact": {}
  },
  "tags": [],
@@ -12633,7 +12631,6 @@
          "server.apkLinks",
          "server.storage",
          "server.statistics",
-          "server.versionCheck",
          "serverLicense.read",
          "serverLicense.update",
          "serverLicense.delete",
@@ -14944,11 +14941,9 @@
          "AlbumUserV1",
          "AlbumUserBackfillV1",
          "AlbumUserDeleteV1",
-          "AlbumAssetCreateV1",
-          "AlbumAssetUpdateV1",
+          "AlbumAssetV1",
          "AlbumAssetBackfillV1",
-          "AlbumAssetExifCreateV1",
-          "AlbumAssetExifUpdateV1",
+          "AlbumAssetExifV1",
          "AlbumAssetExifBackfillV1",
          "AlbumToAssetV1",
          "AlbumToAssetDeleteV1",
--- a/open-api/typescript-sdk/.nvmrc
+++ b/open-api/typescript-sdk/.nvmrc
@@ -1 +1 @@
-22.18.0
+22.17.1
--- a/open-api/typescript-sdk/package-lock.json
+++ b/open-api/typescript-sdk/package-lock.json
@@ -1,18 +1,18 @@
 {
  "name": "@immich/sdk",
-  "version": "1.137.3",
+  "version": "1.137.2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@immich/sdk",
-      "version": "1.137.3",
+      "version": "1.137.2",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@oazapfts/runtime": "^1.0.2"
      },
      "devDependencies": {
-        "@types/node": "^22.17.0",
+        "@types/node": "^22.16.5",
        "typescript": "^5.3.3"
      }
    },
@@ -23,9 +23,9 @@
      "license": "MIT"
    },
    "node_modules/@types/node": {
-      "version": "22.17.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.0.tgz",
-      "integrity": "sha512-bbAKTCqX5aNVryi7qXVMi+OkB3w/OyblodicMbvE38blyAz7GxXf6XYhklokijuPwwVg9sDLKRxt0ZHXQwZVfQ==",
+      "version": "22.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.16.5.tgz",
+      "integrity": "sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/sdk",
-  "version": "1.137.3",
+  "version": "1.137.2",
  "description": "Auto-generated TypeScript SDK for the Immich API",
  "type": "module",
  "main": "./build/index.js",
@@ -19,7 +19,7 @@
    "@oazapfts/runtime": "^1.0.2"
  },
  "devDependencies": {
-    "@types/node": "^22.17.0",
+    "@types/node": "^22.16.5",
    "typescript": "^5.3.3"
  },
  "repository": {
@@ -28,6 +28,6 @@
    "directory": "open-api/typescript-sdk"
  },
  "volta": {
-    "node": "22.18.0"
+    "node": "22.17.1"
  }
 }
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1,6 +1,6 @@
 /**
 * Immich
- * 1.137.3
+ * 1.137.2
 * DO NOT MODIFY - This file has been generated using oazapfts.
 * See https://www.npmjs.com/package/oazapfts
 */
@@ -3552,9 +3552,6 @@ export function getServerVersion(opts?: Oazapfts.RequestOpts) {
        ...opts
    }));
 }
-/**
- * This endpoint requires the `server.versionCheck` permission.
- */
 export function getVersionCheck(opts?: Oazapfts.RequestOpts) {
    return oazapfts.ok(oazapfts.fetchJson<{
        status: 200;
@@ -4619,7 +4616,6 @@ export enum Permission {
    ServerApkLinks = "server.apkLinks",
    ServerStorage = "server.storage",
    ServerStatistics = "server.statistics",
-    ServerVersionCheck = "server.versionCheck",
    ServerLicenseRead = "serverLicense.read",
    ServerLicenseUpdate = "serverLicense.update",
    ServerLicenseDelete = "serverLicense.delete",
@@ -4770,11 +4766,9 @@ export enum SyncEntityType {
    AlbumUserV1 = "AlbumUserV1",
    AlbumUserBackfillV1 = "AlbumUserBackfillV1",
    AlbumUserDeleteV1 = "AlbumUserDeleteV1",
-    AlbumAssetCreateV1 = "AlbumAssetCreateV1",
-    AlbumAssetUpdateV1 = "AlbumAssetUpdateV1",
+    AlbumAssetV1 = "AlbumAssetV1",
    AlbumAssetBackfillV1 = "AlbumAssetBackfillV1",
-    AlbumAssetExifCreateV1 = "AlbumAssetExifCreateV1",
-    AlbumAssetExifUpdateV1 = "AlbumAssetExifUpdateV1",
+    AlbumAssetExifV1 = "AlbumAssetExifV1",
    AlbumAssetExifBackfillV1 = "AlbumAssetExifBackfillV1",
    AlbumToAssetV1 = "AlbumToAssetV1",
    AlbumToAssetDeleteV1 = "AlbumToAssetDeleteV1",
--- a/server/.nvmrc
+++ b/server/.nvmrc
@@ -1 +1 @@
-22.18.0
+22.17.1
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:202507291116@sha256:e38543bdd77a02ed156cd9175ed11e9c16dccf48c418d46ecda48ce684de456a AS dev
+FROM ghcr.io/immich-app/base-server-dev:202507162011@sha256:85d4230c2208646bd6c528db41b2213d780b11b7a311397ca6a2aaba7cf697c8 AS dev

 WORKDIR /usr/src/app
 COPY ./server/package* ./server/
@@ -96,7 +96,7 @@ WORKDIR /usr/src/app/web
 RUN npm ci && npm run build

 # prod build
-FROM ghcr.io/immich-app/base-server-prod:202507291116@sha256:6e80f884c6e4f05cefe4b4fc4cc06a15bdb6ec9bd7b6e9eadf996a13b69494b6
+FROM ghcr.io/immich-app/base-server-prod:202507162011@sha256:636f3ddb6106628ef851d51c23f3fa2c6e4829390cc315b27b38c288c82b23a7

 WORKDIR /usr/src/app
 ENV NODE_ENV=production \
--- a/server/package-lock.json
+++ b/server/package-lock.json
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich",
-  "version": "1.137.3",
+  "version": "1.137.2",
  "description": "",
  "author": "",
  "private": true,
@@ -110,7 +110,6 @@
    "thumbhash": "^0.1.1",
    "typeorm": "^0.3.17",
    "ua-parser-js": "^2.0.0",
-    "uuid": "^11.1.0",
    "validator": "^13.12.0"
  },
  "devDependencies": {
@@ -124,7 +123,7 @@
    "@testcontainers/redis": "^11.0.0",
    "@types/archiver": "^6.0.0",
    "@types/async-lock": "^1.4.2",
-    "@types/bcrypt": "^6.0.0",
+    "@types/bcrypt": "^5.0.0",
    "@types/body-parser": "^1.19.6",
    "@types/compression": "^1.7.5",
    "@types/cookie-parser": "^1.4.8",
@@ -135,7 +134,7 @@
    "@types/luxon": "^3.6.2",
    "@types/mock-fs": "^4.13.1",
    "@types/multer": "^2.0.0",
-    "@types/node": "^22.17.0",
+    "@types/node": "^22.16.5",
    "@types/nodemailer": "^6.4.14",
    "@types/picomatch": "^4.0.0",
    "@types/pngjs": "^6.0.5",
@@ -150,7 +149,7 @@
    "eslint": "^9.14.0",
    "eslint-config-prettier": "^10.1.8",
    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^60.0.0",
+    "eslint-plugin-unicorn": "^59.0.0",
    "globals": "^16.0.0",
    "mock-fs": "^5.2.0",
    "node-addon-api": "^8.3.1",
@@ -173,7 +172,7 @@
    "vitest": "^3.0.0"
  },
  "volta": {
-    "node": "22.18.0"
+    "node": "22.17.1"
  },
  "overrides": {
    "sharp": "^0.34.2"
--- a/server/src/controllers/server.controller.ts
+++ b/server/src/controllers/server.controller.ts
@@ -109,7 +109,7 @@ export class ServerController {
  }

  @Get('version-check')
-  @Authenticated({ permission: Permission.ServerVersionCheck })
+  @Authenticated()
  getVersionCheck(): Promise<VersionCheckStateResponseDto> {
    return this.systemMetadataService.getVersionCheckState();
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zack Pollard	4cac0a7449	wip	2025-08-04 18:12:32 +01:00
Zack Pollard	93aaf92c55	wip	2025-08-04 12:00:35 +01:00
@@ -1 +1 @@
 .18.0
 .17.1