fix: change CronJob in addCronJob to match new type required by nestjs schedule module

.gitattributes

@@ -17,5 +17,3 @@ web/src/api/open-api/**/*.md -diff -merge
 web/src/api/open-api/**/*.md linguist-generated=true
 web/src/api/open-api/**/*.ts -diff -merge
 web/src/api/open-api/**/*.ts linguist-generated=true
-
-*.sh text eol=lf

.github/workflows/build-mobile.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           ref: ${{ steps.get-ref.outputs.ref }}
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
           java-version: "12.x"

.github/workflows/cache-cleanup.yml

@@ -1,4 +1,4 @@
-name: Cache Cleanup
+name: Clean up actions cache on PR close
 on:
   pull_request:
     types:
@@ -10,7 +10,6 @@ concurrency:
 
 jobs:
   cleanup:
-    name: Cleanup
     runs-on: ubuntu-latest
     steps:
       - name: Check out code

.github/workflows/cli-release.yml

@@ -1,10 +1,9 @@
-name: CLI Release
+name: Publish Package to npmjs
 on:
   workflow_dispatch:
 
 jobs:
   publish:
-    name: Publish
     runs-on: ubuntu-latest
     defaults:
       run:

.github/workflows/docker-cleanup.yml

@@ -5,7 +5,7 @@
 #
 # This workflow will not trigger runs on forked repos.
 
-name: Docker Cleanup
+name: Cleanup Old Docker Images
 
 on:
   pull_request:

.github/workflows/docker.yml

@@ -1,4 +1,4 @@
-name: Docker
+name: Build and Push Docker Images
 
 on:
   workflow_dispatch:
@@ -18,7 +18,6 @@ permissions:
 
 jobs:
   build_and_push:
-    name: Build and Push
     runs-on: ubuntu-latest
     strategy:
       # Prevent a failure in one image from stopping the other builds

.github/workflows/test.yml

@@ -11,7 +11,7 @@ concurrency:
 
 jobs:
   e2e-tests:
-    name: Server (e2e)
+    name: Run end-to-end test suites
     runs-on: ubuntu-latest
 
     steps:
@@ -24,7 +24,7 @@ jobs:
         run: docker compose -f ./docker/docker-compose.test.yml up --renew-anon-volumes --abort-on-container-exit --exit-code-from immich-server --remove-orphans --build
 
   doc-tests:
-    name: Docs
+    name: Run documentation checks
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -45,12 +45,8 @@ jobs:
         run: npm run check
         if: ${{ !cancelled() }}
 
-      - name: Run build
-        run: npm run build
-        if: ${{ !cancelled() }}
-
   server-unit-tests:
-    name: Server
+    name: Run server unit test suites and checks
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -80,7 +76,7 @@ jobs:
         if: ${{ !cancelled() }}
 
   cli-unit-tests:
-    name: CLI
+    name: Run cli test suites
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -110,7 +106,7 @@ jobs:
         if: ${{ !cancelled() }}
 
   web-unit-tests:
-    name: Web
+    name: Run web unit test suites and checks
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -144,7 +140,7 @@ jobs:
       #   if: ${{ !cancelled() }}
 
   mobile-unit-tests:
-    name: Mobile
+    name: Run mobile unit tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -158,7 +154,7 @@ jobs:
         run: flutter test -j 1
 
   ml-unit-tests:
-    name: Machine Learning
+    name: Run ML unit tests and checks
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -188,7 +184,7 @@ jobs:
           poetry run pytest --cov app
 
   generated-api-up-to-date:
-    name: OpenAPI Clients
+    name: Check generated files are up-to-date
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -209,11 +205,11 @@ jobs:
           exit 1
 
   generated-typeorm-migrations-up-to-date:
-    name: TypeORM Checks
+    name: Check generated TypeORM migrations are up-to-date
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres@sha256:6dfee32131933ab4ca25a00360c3f427fdc134de56f9a90c6c9a4956b48aea85
+        image: postgres
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_USER: postgres
@@ -236,7 +232,7 @@ jobs:
       - name: Install server dependencies
         run: npm ci
 
-      - name: Build the app
+      - name: Build the
         run: npm run build
 
       - name: Run existing migrations
@@ -252,30 +248,13 @@ jobs:
         with:
           files: |
             server/src/infra/migrations/
-      - name: Verify migration files have not changed
+      - name: Verify files have not changed
         if: steps.verify-changed-files.outputs.files_changed == 'true'
         run: |
-          echo "ERROR: Generated migration files not up to date!"
+          echo "ERROR: Generated files not up to date!"
           echo "Changed files: ${{ steps.verify-changed-files.outputs.changed_files }}"
           exit 1
 
-      - name: Run SQL generation
-        run: npm run sql:generate
-
-      - name: Find file changes
-        uses: tj-actions/verify-changed-files@v13.1
-        id: verify-changed-sql-files
-        with:
-          files: |
-            server/src/infra/sql
-
-      - name: Verify SQL files have not changed
-        if: steps.verify-changed-sql-files.outputs.files_changed == 'true'
-        run: |
-          echo "ERROR: Generated SQL files not up to date!"
-          echo "Changed files: ${{ steps.verify-changed-sql-files.outputs.changed_files }}"
-          exit 1
-
   # mobile-integration-tests:
   #   name: Run mobile end-to-end integration tests
   #   runs-on: macos-latest

Makefile

@@ -26,10 +26,7 @@ prod-scale:
 	docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans
 
 api:
-	npm --prefix server run api:generate
+	cd ./server && npm run api:generate
-
-sql:
-	npm --prefix server run sql:generate
 
 attach-server:
 	docker exec -it docker_immich-server_1 sh

README_de_DE.md

@@ -11,7 +11,7 @@
 <p align="center">
 <img src="design/immich-logo.svg" width="150" title="Login mit eigener URL">
 </p>
-<h3 align="center">Immich - Hoch performante, selbst gehostete Backup-Lösung für Fotos und Videos</h3>
+<h3 align="center">Immich - Hoch performante, selbst gehostete Backup Lösung für Fotos und Videos</h3>
 <br/>
 <a href="https://immich.app">
 <img src="design/immich-screenshots.png" title="Haupt-Screenshot">
@@ -32,10 +32,10 @@
 
 ## Warnung
 
-- ⚠️ Das Projekt befindet sich in **sehr aktiver** Entwicklung.
+- ⚠️ Das Projekt befindet sich unter **sehr aktiver** Entwicklung.
 - ⚠️ Erwarte Fehler und Änderungen mit Breaking-Changes.
 - ⚠️ **Nutze die App auf keinen Fall als einziges Speichermedium für deine Fotos und Videos.**
-- ⚠️ Befolge immer die [3-2-1](https://www.backblaze.com/blog/the-3-2-1-backup-strategy/) Backup-Regel für deine wertvollen Fotos und Videos!
+- ⚠️ Befolge immer die [3-2-1](https://www.backblaze.com/blog/the-3-2-1-backup-strategy/) Backup Regel für deine wertvollen Fotos und Videos!
 
 ## Inhalt
 
@@ -54,9 +54,9 @@ Die Hauptdokumentation, inklusive Installationsanleitungen, ist unter https://im
 
 ## Demo
 
-Die Web-Demo kannst Du unter https://demo.immich.app finden.
+Die Web-Demo kannst du unter https://demo.immich.app finden.
 
-Für die Handy-App kannst Du `https://demo.immich.app/api` als `Server Endpoint URL` angeben.
+Für die Handy-App kannst du `https://demo.immich.app/api` als `Server Endpoint URL` angeben.
 
 ```bash title="Demo Credential"
 Die Anmeldedaten
@@ -73,8 +73,8 @@ Spec: Free-tier Oracle VM - Amsterdam - 2.4Ghz quad-core ARM64 CPU, 24GB RAM
 | Funktionen                                           | Mobil  | Web   |
 | ---------------------------------------------------- | ------ | ----- |
 | Fotos & Videos hochladen und ansehen                 | Ja     | Ja    |
-| Automatisches Backup wenn die App geöffnet ist       | Ja     | n. a. |
+| Automatisches Backup wenn die App offen ist          | Ja     | n. a. |
-| Selektive Auswahl von Alben zum Sichern              | Ja     | n. a. |
+| Selektive Auswahl von Alben zum Backup               | Ja     | n. a. |
 | Fotos und Videos auf das Gerät herunterladen         | Ja     | Ja    |
 | Unterstützt mehrere Benutzer                         | Ja     | Ja    |
 | Album und geteilte Alben                             | Ja     | Ja    |
@@ -82,7 +82,7 @@ Spec: Free-tier Oracle VM - Amsterdam - 2.4Ghz quad-core ARM64 CPU, 24GB RAM
 | Unterstützt RAW Formate                              | Ja     | Ja    |
 | Metadaten anzeigen (EXIF, Karte)                     | Ja     | Ja    |
 | Suchen nach Metadaten, Objekten, Gesichtern und CLIP | Ja     | Ja    |
-| Administrative Funktionen (Benutzerverwaltung)       | Nein   | Ja    |
+| Administrative Funktionen (Nutzerverwaltung)         | Nein   | Ja    |
 | Backup im Hintergrund                                | Ja     | n. a. |
 | Virtuelles Scrollen                                  | Ja     | Ja    |
 | OAuth Unterstützung                                  | Ja     | Ja    |
@@ -101,22 +101,22 @@ Spec: Free-tier Oracle VM - Amsterdam - 2.4Ghz quad-core ARM64 CPU, 24GB RAM
 
 ## Unterstütze das Projekt
 
-Ich habe mich diesem Projekt verpflichtet und werde nicht aufgeben. Ich werde die Dokumentation weiter aktualisieren, neue Funktionen hinzufügen und Fehler beheben. Allerdings kann ich das nicht alleine schaffen. Daher brauche ich Eure Unterstützung, um mir zusätzliche Motivation zu geben, weiterzumachen.
+Ich habe mich diesem Projekt verpflichtet und werde nicht aufgeben. Ich werde die Dokumentation weiter aktualisieren, neue Funktionen hinzufügen und Fehler beheben. Allerdings kann ich das nicht alleine schaffen. Daher brauche ich Eure Unterstützung mir zusätzliche Motivation zu geben um weiterzumachen.
 
 Wie unsere Gastgeber in der [selfhosted.show - In der Episode 'The-organization-must-not-be-name is a Hostile Actor'](https://selfhosted.show/79?t=1418) gesagt haben, ist dies ein riesiges Unterfangen, welchem das Team und ich uns annehmen. In Zukunft würde ich liebend gerne Vollzeit an dem Projekt arbeiten und bitte daher um Eure Unterstützung.
 
-Wenn Du denkst, dass dies die richtige Sache ist und dich selbst die App für eine längere Zeit nutzen siehst, dann denke bitte darüber nach, das Projekt mit einer der unten aufgelisteten Optionen zu unterstützen.  
+Wenn Du denkst, dass dies die richtige Sache ist und dich selbst die App für eine längere Zeit nutzen siehst, dann denke bitte darüber nach das Projekt mit einer der unten aufgelisteten Optionen zu unterstützen.  
 
 ### Spenden
 
-- [Monatliche Spende](https://github.com/sponsors/immich-app) via GitHub Sponsors
+- [Monatliche Spende](https://github.com/sponsors/alextran1502) via GitHub Sponsors
-- [Einmalige Spende](https://github.com/sponsors/immich-app?frequency=one-time&sponsor=immich-app) via GitHub Sponsors
+- [Einmalige Spende](https://github.com/sponsors/alextran1502?frequency=one-time&sponsor=alextran1502) via GitHub Sponsors
 - [Librepay](https://liberapay.com/alex.tran1502/)
 - [buymeacoffee](https://www.buymeacoffee.com/altran1502)
 - Bitcoin: 1FvEp6P6NM8EZEkpGUFAN2LqJ1gxusNxZX
 - ZCash: u1smm4wvqegcp46zss2jf5xptchgeczp4rx7a0wu3mermf2wxahm26yyz5w9mw3f2p4emwlljxjumg774kgs8rntt9yags0whnzane4n67z4c7gppq4yyvcj404ne3r769prwzd9j8ntvqp44fa6d67sf7rmcfjmds3gmeceff4u8e92rh38nd30cr96xw6vfhk6scu4ws90ldzupr3sz
 
-## Mitwirkende
+## Unterstützer
 <a href="https://github.com/alextran1502/immich/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=immich-app/immich" width="100%"/>
 </a>

cli/package-lock.json

@@ -29,8 +29,8 @@
         "@types/mime-types": "^2.1.1",
         "@types/mock-fs": "^4.13.1",
         "@types/node": "^20.3.1",
-        "@typescript-eslint/eslint-plugin": "^6.0.0",
+        "@typescript-eslint/eslint-plugin": "^5.60.1",
-        "@typescript-eslint/parser": "^6.0.0",
+        "@typescript-eslint/parser": "^5.48.1",
         "chai": "^4.3.7",
         "eslint": "^8.43.0",
         "eslint-config-prettier": "^9.0.0",
@@ -46,7 +46,7 @@
         "ts-jest": "^29.1.0",
         "ts-node": "^10.9.1",
         "tslib": "^2.5.3",
-        "typescript": "^5.0.0"
+        "typescript": "^4.9.4"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -1604,9 +1604,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.10.1",
+      "version": "20.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz",
-      "integrity": "sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg==",
+      "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
@@ -1646,33 +1646,32 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.13.1",
+      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
-      "integrity": "sha512-5bQDGkXaxD46bPvQt08BUz9YSaO4S0fB1LB5JHQuXTfkGPI3+UUeS387C/e9jRie5GqT8u5kFTrMvAjtX4O5kA==",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
       "dev": true,
       "dependencies": {
-        "@eslint-community/regexpp": "^4.5.1",
+        "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "6.13.1",
+        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/type-utils": "6.13.1",
+        "@typescript-eslint/type-utils": "5.62.0",
-        "@typescript-eslint/utils": "6.13.1",
+        "@typescript-eslint/utils": "5.62.0",
-        "@typescript-eslint/visitor-keys": "6.13.1",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
-        "ignore": "^5.2.4",
+        "ignore": "^5.2.0",
-        "natural-compare": "^1.4.0",
+        "natural-compare-lite": "^1.4.0",
-        "semver": "^7.5.4",
+        "semver": "^7.3.7",
-        "ts-api-utils": "^1.0.1"
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
+        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -1680,126 +1679,26 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz",
-      "integrity": "sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.13.1",
-        "@typescript-eslint/visitor-keys": "6.13.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.1.tgz",
-      "integrity": "sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==",
-      "dev": true,
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz",
-      "integrity": "sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.13.1",
-        "@typescript-eslint/visitor-keys": "6.13.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.1.tgz",
-      "integrity": "sha512-ouPn/zVoan92JgAegesTXDB/oUp6BP1v8WpfYcqh649ejNc9Qv+B4FF2Ff626kO1xg0wWwwG48lAJ4JuesgdOw==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.13.1",
-        "@typescript-eslint/types": "6.13.1",
-        "@typescript-eslint/typescript-estree": "6.13.1",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz",
-      "integrity": "sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.13.1",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.13.1",
+      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
-      "integrity": "sha512-fs2XOhWCzRhqMmQf0eicLa/CWSaYss2feXsy7xBD/pLyWke/jCIVc2s1ikEAtSW7ina1HNhv7kONoEfVNEcdDQ==",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.13.1",
+        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "6.13.1",
+        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "6.13.1",
+        "@typescript-eslint/typescript-estree": "5.62.0",
-        "@typescript-eslint/visitor-keys": "6.13.1",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -1807,80 +1706,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz",
-      "integrity": "sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.13.1",
-        "@typescript-eslint/visitor-keys": "6.13.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.1.tgz",
-      "integrity": "sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==",
-      "dev": true,
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz",
-      "integrity": "sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.13.1",
-        "@typescript-eslint/visitor-keys": "6.13.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz",
-      "integrity": "sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.13.1",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
@@ -1899,25 +1724,25 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.13.1",
+      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
-      "integrity": "sha512-A2qPlgpxx2v//3meMqQyB1qqTg1h1dJvzca7TugM3Yc2USDY+fsRBiojAEo92HO7f5hW5mjAUF6qobOPzlBCBQ==",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.13.1",
+        "@typescript-eslint/typescript-estree": "5.62.0",
-        "@typescript-eslint/utils": "6.13.1",
+        "@typescript-eslint/utils": "5.62.0",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.0.1"
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "*"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -1925,105 +1750,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz",
-      "integrity": "sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.13.1",
-        "@typescript-eslint/visitor-keys": "6.13.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.1.tgz",
-      "integrity": "sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==",
-      "dev": true,
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz",
-      "integrity": "sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.13.1",
-        "@typescript-eslint/visitor-keys": "6.13.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.1.tgz",
-      "integrity": "sha512-ouPn/zVoan92JgAegesTXDB/oUp6BP1v8WpfYcqh649ejNc9Qv+B4FF2Ff626kO1xg0wWwwG48lAJ4JuesgdOw==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.13.1",
-        "@typescript-eslint/types": "6.13.1",
-        "@typescript-eslint/typescript-estree": "6.13.1",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz",
-      "integrity": "sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.13.1",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/types": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
@@ -5138,6 +4864,12 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -6291,18 +6023,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/ts-api-utils": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
-      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
-      "dev": true,
-      "engines": {
-        "node": ">=16.13.0"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.2.0"
-      }
-    },
     "node_modules/ts-jest": {
       "version": "29.1.1",
       "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz",
@@ -6450,16 +6170,16 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.3.2",
+      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=14.17"
+        "node": ">=4.2.0"
       }
     },
     "node_modules/undici-types": {
@@ -7990,9 +7710,9 @@
       }
     },
     "@types/node": {
-      "version": "20.10.1",
+      "version": "20.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz",
-      "integrity": "sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg==",
+      "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==",
       "dev": true,
       "requires": {
         "undici-types": "~5.26.4"
@@ -8032,136 +7752,33 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "6.13.1",
+      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
-      "integrity": "sha512-5bQDGkXaxD46bPvQt08BUz9YSaO4S0fB1LB5JHQuXTfkGPI3+UUeS387C/e9jRie5GqT8u5kFTrMvAjtX4O5kA==",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
       "dev": true,
       "requires": {
-        "@eslint-community/regexpp": "^4.5.1",
+        "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "6.13.1",
+        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/type-utils": "6.13.1",
+        "@typescript-eslint/type-utils": "5.62.0",
-        "@typescript-eslint/utils": "6.13.1",
+        "@typescript-eslint/utils": "5.62.0",
-        "@typescript-eslint/visitor-keys": "6.13.1",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
-        "ignore": "^5.2.4",
+        "ignore": "^5.2.0",
-        "natural-compare": "^1.4.0",
+        "natural-compare-lite": "^1.4.0",
-        "semver": "^7.5.4",
+        "semver": "^7.3.7",
-        "ts-api-utils": "^1.0.1"
+        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz",
-          "integrity": "sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.13.1",
-            "@typescript-eslint/visitor-keys": "6.13.1"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.1.tgz",
-          "integrity": "sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz",
-          "integrity": "sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.13.1",
-            "@typescript-eslint/visitor-keys": "6.13.1",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.5.4",
-            "ts-api-utils": "^1.0.1"
-          }
-        },
-        "@typescript-eslint/utils": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.1.tgz",
-          "integrity": "sha512-ouPn/zVoan92JgAegesTXDB/oUp6BP1v8WpfYcqh649ejNc9Qv+B4FF2Ff626kO1xg0wWwwG48lAJ4JuesgdOw==",
-          "dev": true,
-          "requires": {
-            "@eslint-community/eslint-utils": "^4.4.0",
-            "@types/json-schema": "^7.0.12",
-            "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.13.1",
-            "@typescript-eslint/types": "6.13.1",
-            "@typescript-eslint/typescript-estree": "6.13.1",
-            "semver": "^7.5.4"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz",
-          "integrity": "sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.13.1",
-            "eslint-visitor-keys": "^3.4.1"
-          }
-        }
       }
     },
     "@typescript-eslint/parser": {
-      "version": "6.13.1",
+      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
-      "integrity": "sha512-fs2XOhWCzRhqMmQf0eicLa/CWSaYss2feXsy7xBD/pLyWke/jCIVc2s1ikEAtSW7ina1HNhv7kONoEfVNEcdDQ==",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "6.13.1",
+        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "6.13.1",
+        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "6.13.1",
+        "@typescript-eslint/typescript-estree": "5.62.0",
-        "@typescript-eslint/visitor-keys": "6.13.1",
         "debug": "^4.3.4"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz",
-          "integrity": "sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.13.1",
-            "@typescript-eslint/visitor-keys": "6.13.1"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.1.tgz",
-          "integrity": "sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz",
-          "integrity": "sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.13.1",
-            "@typescript-eslint/visitor-keys": "6.13.1",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.5.4",
-            "ts-api-utils": "^1.0.1"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz",
-          "integrity": "sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.13.1",
-            "eslint-visitor-keys": "^3.4.1"
-          }
-        }
       }
     },
     "@typescript-eslint/scope-manager": {
@@ -8175,73 +7792,15 @@
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "6.13.1",
+      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
-      "integrity": "sha512-A2qPlgpxx2v//3meMqQyB1qqTg1h1dJvzca7TugM3Yc2USDY+fsRBiojAEo92HO7f5hW5mjAUF6qobOPzlBCBQ==",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "6.13.1",
+        "@typescript-eslint/typescript-estree": "5.62.0",
-        "@typescript-eslint/utils": "6.13.1",
+        "@typescript-eslint/utils": "5.62.0",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.0.1"
+        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz",
-          "integrity": "sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.13.1",
-            "@typescript-eslint/visitor-keys": "6.13.1"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.1.tgz",
-          "integrity": "sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz",
-          "integrity": "sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.13.1",
-            "@typescript-eslint/visitor-keys": "6.13.1",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.5.4",
-            "ts-api-utils": "^1.0.1"
-          }
-        },
-        "@typescript-eslint/utils": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.1.tgz",
-          "integrity": "sha512-ouPn/zVoan92JgAegesTXDB/oUp6BP1v8WpfYcqh649ejNc9Qv+B4FF2Ff626kO1xg0wWwwG48lAJ4JuesgdOw==",
-          "dev": true,
-          "requires": {
-            "@eslint-community/eslint-utils": "^4.4.0",
-            "@types/json-schema": "^7.0.12",
-            "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.13.1",
-            "@typescript-eslint/types": "6.13.1",
-            "@typescript-eslint/typescript-estree": "6.13.1",
-            "semver": "^7.5.4"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "6.13.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz",
-          "integrity": "sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.13.1",
-            "eslint-visitor-keys": "^3.4.1"
-          }
-        }
       }
     },
     "@typescript-eslint/types": {
@@ -10476,6 +10035,12 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
+    "natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -11300,13 +10865,6 @@
         "is-number": "^7.0.0"
       }
     },
-    "ts-api-utils": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
-      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
-      "dev": true,
-      "requires": {}
-    },
     "ts-jest": {
       "version": "29.1.1",
       "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz",
@@ -11389,9 +10947,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "5.3.2",
+      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true
     },
     "undici-types": {

cli/package.json

@@ -29,8 +29,8 @@
     "@types/mime-types": "^2.1.1",
     "@types/mock-fs": "^4.13.1",
     "@types/node": "^20.3.1",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.60.1",
-    "@typescript-eslint/parser": "^6.0.0",
+    "@typescript-eslint/parser": "^5.48.1",
     "chai": "^4.3.7",
     "eslint": "^8.43.0",
     "eslint-config-prettier": "^9.0.0",
@@ -46,7 +46,7 @@
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.3",
-    "typescript": "^5.0.0"
+    "typescript": "^4.9.4"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",

cli/src/api/open-api/api.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.89.0
+ * The version of the OpenAPI document: 1.88.2
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -447,12 +447,6 @@ export interface AssetBulkDeleteDto {
  * @interface AssetBulkUpdateDto
  */
 export interface AssetBulkUpdateDto {
-    /**
-     * 
-     * @type {string}
-     * @memberof AssetBulkUpdateDto
-     */
-    'dateTimeOriginal'?: string;
     /**
      * 
      * @type {Array<string>}
@@ -471,18 +465,6 @@ export interface AssetBulkUpdateDto {
      * @memberof AssetBulkUpdateDto
      */
     'isFavorite'?: boolean;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetBulkUpdateDto
-     */
-    'latitude'?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetBulkUpdateDto
-     */
-    'longitude'?: number;
     /**
      * 
      * @type {boolean}
@@ -586,142 +568,6 @@ export const AssetBulkUploadCheckResultReasonEnum = {
 
 export type AssetBulkUploadCheckResultReasonEnum = typeof AssetBulkUploadCheckResultReasonEnum[keyof typeof AssetBulkUploadCheckResultReasonEnum];
 
-/**
- * 
- * @export
- * @interface AssetFaceResponseDto
- */
-export interface AssetFaceResponseDto {
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceResponseDto
-     */
-    'boundingBoxX1': number;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceResponseDto
-     */
-    'boundingBoxX2': number;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceResponseDto
-     */
-    'boundingBoxY1': number;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceResponseDto
-     */
-    'boundingBoxY2': number;
-    /**
-     * 
-     * @type {string}
-     * @memberof AssetFaceResponseDto
-     */
-    'id': string;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceResponseDto
-     */
-    'imageHeight': number;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceResponseDto
-     */
-    'imageWidth': number;
-    /**
-     * 
-     * @type {PersonResponseDto}
-     * @memberof AssetFaceResponseDto
-     */
-    'person': PersonResponseDto | null;
-}
-/**
- * 
- * @export
- * @interface AssetFaceUpdateDto
- */
-export interface AssetFaceUpdateDto {
-    /**
-     * 
-     * @type {Array<AssetFaceUpdateItem>}
-     * @memberof AssetFaceUpdateDto
-     */
-    'data': Array<AssetFaceUpdateItem>;
-}
-/**
- * 
- * @export
- * @interface AssetFaceUpdateItem
- */
-export interface AssetFaceUpdateItem {
-    /**
-     * 
-     * @type {string}
-     * @memberof AssetFaceUpdateItem
-     */
-    'assetId': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof AssetFaceUpdateItem
-     */
-    'personId': string;
-}
-/**
- * 
- * @export
- * @interface AssetFaceWithoutPersonResponseDto
- */
-export interface AssetFaceWithoutPersonResponseDto {
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceWithoutPersonResponseDto
-     */
-    'boundingBoxX1': number;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceWithoutPersonResponseDto
-     */
-    'boundingBoxX2': number;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceWithoutPersonResponseDto
-     */
-    'boundingBoxY1': number;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceWithoutPersonResponseDto
-     */
-    'boundingBoxY2': number;
-    /**
-     * 
-     * @type {string}
-     * @memberof AssetFaceWithoutPersonResponseDto
-     */
-    'id': string;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceWithoutPersonResponseDto
-     */
-    'imageHeight': number;
-    /**
-     * 
-     * @type {number}
-     * @memberof AssetFaceWithoutPersonResponseDto
-     */
-    'imageWidth': number;
-}
 /**
  * 
  * @export
@@ -978,10 +824,10 @@ export interface AssetResponseDto {
     'ownerId': string;
     /**
      * 
-     * @type {Array<PersonWithFacesResponseDto>}
+     * @type {Array<PersonResponseDto>}
      * @memberof AssetResponseDto
      */
-    'people'?: Array<PersonWithFacesResponseDto>;
+    'people'?: Array<PersonResponseDto>;
     /**
      * 
      * @type {boolean}
@@ -1808,19 +1654,6 @@ export interface ExifResponseDto {
      */
     'timeZone'?: string | null;
 }
-/**
- * 
- * @export
- * @interface FaceDto
- */
-export interface FaceDto {
-    /**
-     * 
-     * @type {string}
-     * @memberof FaceDto
-     */
-    'id': string;
-}
 /**
  * 
  * @export
@@ -1934,8 +1767,7 @@ export const JobCommand = {
     Start: 'start',
     Pause: 'pause',
     Resume: 'resume',
-    Empty: 'empty',
+    Empty: 'empty'
-    ClearFailed: 'clear-failed'
 } as const;
 
 export type JobCommand = typeof JobCommand[keyof typeof JobCommand];
@@ -2713,49 +2545,6 @@ export interface PersonUpdateDto {
      */
     'name'?: string;
 }
-/**
- * 
- * @export
- * @interface PersonWithFacesResponseDto
- */
-export interface PersonWithFacesResponseDto {
-    /**
-     * 
-     * @type {string}
-     * @memberof PersonWithFacesResponseDto
-     */
-    'birthDate': string | null;
-    /**
-     * 
-     * @type {Array<AssetFaceWithoutPersonResponseDto>}
-     * @memberof PersonWithFacesResponseDto
-     */
-    'faces': Array<AssetFaceWithoutPersonResponseDto>;
-    /**
-     * 
-     * @type {string}
-     * @memberof PersonWithFacesResponseDto
-     */
-    'id': string;
-    /**
-     * 
-     * @type {boolean}
-     * @memberof PersonWithFacesResponseDto
-     */
-    'isHidden': boolean;
-    /**
-     * 
-     * @type {string}
-     * @memberof PersonWithFacesResponseDto
-     */
-    'name': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof PersonWithFacesResponseDto
-     */
-    'thumbnailPath': string;
-}
 /**
  * 
  * @export
@@ -4348,12 +4137,6 @@ export interface UpdateAlbumDto {
  * @interface UpdateAssetDto
  */
 export interface UpdateAssetDto {
-    /**
-     * 
-     * @type {string}
-     * @memberof UpdateAssetDto
-     */
-    'dateTimeOriginal'?: string;
     /**
      * 
      * @type {string}
@@ -4372,18 +4155,6 @@ export interface UpdateAssetDto {
      * @memberof UpdateAssetDto
      */
     'isFavorite'?: boolean;
-    /**
-     * 
-     * @type {number}
-     * @memberof UpdateAssetDto
-     */
-    'latitude'?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof UpdateAssetDto
-     */
-    'longitude'?: number;
 }
 /**
  * 
@@ -11541,233 +11312,6 @@ export class AuthenticationApi extends BaseAPI {
 }
 
 
-/**
- * FaceApi - axios parameter creator
- * @export
- */
-export const FaceApiAxiosParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * 
-         * @param {string} id 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getFaces: async (id: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('getFaces', 'id', id)
-            const localVarPath = `/face`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication cookie required
-
-            // authentication api_key required
-            await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration)
-
-            // authentication bearer required
-            // http bearer authentication required
-            await setBearerAuthToObject(localVarHeaderParameter, configuration)
-
-            if (id !== undefined) {
-                localVarQueryParameter['id'] = id;
-            }
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id 
-         * @param {FaceDto} faceDto 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        reassignFacesById: async (id: string, faceDto: FaceDto, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('reassignFacesById', 'id', id)
-            // verify required parameter 'faceDto' is not null or undefined
-            assertParamExists('reassignFacesById', 'faceDto', faceDto)
-            const localVarPath = `/face/{id}`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication cookie required
-
-            // authentication api_key required
-            await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration)
-
-            // authentication bearer required
-            // http bearer authentication required
-            await setBearerAuthToObject(localVarHeaderParameter, configuration)
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(faceDto, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-    }
-};
-
-/**
- * FaceApi - functional programming interface
- * @export
- */
-export const FaceApiFp = function(configuration?: Configuration) {
-    const localVarAxiosParamCreator = FaceApiAxiosParamCreator(configuration)
-    return {
-        /**
-         * 
-         * @param {string} id 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async getFaces(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<AssetFaceResponseDto>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getFaces(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id 
-         * @param {FaceDto} faceDto 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async reassignFacesById(id: string, faceDto: FaceDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PersonResponseDto>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.reassignFacesById(id, faceDto, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-    }
-};
-
-/**
- * FaceApi - factory interface
- * @export
- */
-export const FaceApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
-    const localVarFp = FaceApiFp(configuration)
-    return {
-        /**
-         * 
-         * @param {FaceApiGetFacesRequest} requestParameters Request parameters.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getFaces(requestParameters: FaceApiGetFacesRequest, options?: AxiosRequestConfig): AxiosPromise<Array<AssetFaceResponseDto>> {
-            return localVarFp.getFaces(requestParameters.id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {FaceApiReassignFacesByIdRequest} requestParameters Request parameters.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        reassignFacesById(requestParameters: FaceApiReassignFacesByIdRequest, options?: AxiosRequestConfig): AxiosPromise<PersonResponseDto> {
-            return localVarFp.reassignFacesById(requestParameters.id, requestParameters.faceDto, options).then((request) => request(axios, basePath));
-        },
-    };
-};
-
-/**
- * Request parameters for getFaces operation in FaceApi.
- * @export
- * @interface FaceApiGetFacesRequest
- */
-export interface FaceApiGetFacesRequest {
-    /**
-     * 
-     * @type {string}
-     * @memberof FaceApiGetFaces
-     */
-    readonly id: string
-}
-
-/**
- * Request parameters for reassignFacesById operation in FaceApi.
- * @export
- * @interface FaceApiReassignFacesByIdRequest
- */
-export interface FaceApiReassignFacesByIdRequest {
-    /**
-     * 
-     * @type {string}
-     * @memberof FaceApiReassignFacesById
-     */
-    readonly id: string
-
-    /**
-     * 
-     * @type {FaceDto}
-     * @memberof FaceApiReassignFacesById
-     */
-    readonly faceDto: FaceDto
-}
-
-/**
- * FaceApi - object-oriented interface
- * @export
- * @class FaceApi
- * @extends {BaseAPI}
- */
-export class FaceApi extends BaseAPI {
-    /**
-     * 
-     * @param {FaceApiGetFacesRequest} requestParameters Request parameters.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof FaceApi
-     */
-    public getFaces(requestParameters: FaceApiGetFacesRequest, options?: AxiosRequestConfig) {
-        return FaceApiFp(this.configuration).getFaces(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {FaceApiReassignFacesByIdRequest} requestParameters Request parameters.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof FaceApi
-     */
-    public reassignFacesById(requestParameters: FaceApiReassignFacesByIdRequest, options?: AxiosRequestConfig) {
-        return FaceApiFp(this.configuration).reassignFacesById(requestParameters.id, requestParameters.faceDto, options).then((request) => request(this.axios, this.basePath));
-    }
-}
-
-
 /**
  * JobApi - axios parameter creator
  * @export
@@ -13599,44 +13143,6 @@ export class PartnerApi extends BaseAPI {
  */
 export const PersonApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createPerson: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/person`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication cookie required
-
-            // authentication api_key required
-            await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration)
-
-            // authentication bearer required
-            // http bearer authentication required
-            await setBearerAuthToObject(localVarHeaderParameter, configuration)
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @param {boolean} [withHidden] 
@@ -13896,54 +13402,6 @@ export const PersonApiAxiosParamCreator = function (configuration?: Configuratio
                 options: localVarRequestOptions,
             };
         },
-        /**
-         * 
-         * @param {string} id 
-         * @param {AssetFaceUpdateDto} assetFaceUpdateDto 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        reassignFaces: async (id: string, assetFaceUpdateDto: AssetFaceUpdateDto, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('reassignFaces', 'id', id)
-            // verify required parameter 'assetFaceUpdateDto' is not null or undefined
-            assertParamExists('reassignFaces', 'assetFaceUpdateDto', assetFaceUpdateDto)
-            const localVarPath = `/person/{id}/reassign`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication cookie required
-
-            // authentication api_key required
-            await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration)
-
-            // authentication bearer required
-            // http bearer authentication required
-            await setBearerAuthToObject(localVarHeaderParameter, configuration)
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(assetFaceUpdateDto, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @param {PeopleUpdateDto} peopleUpdateDto 
@@ -14046,15 +13504,6 @@ export const PersonApiAxiosParamCreator = function (configuration?: Configuratio
 export const PersonApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = PersonApiAxiosParamCreator(configuration)
     return {
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async createPerson(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PersonResponseDto>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.createPerson(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {boolean} [withHidden] 
@@ -14116,17 +13565,6 @@ export const PersonApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.mergePerson(id, mergePersonDto, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * 
-         * @param {string} id 
-         * @param {AssetFaceUpdateDto} assetFaceUpdateDto 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async reassignFaces(id: string, assetFaceUpdateDto: AssetFaceUpdateDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<PersonResponseDto>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.reassignFaces(id, assetFaceUpdateDto, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {PeopleUpdateDto} peopleUpdateDto 
@@ -14158,14 +13596,6 @@ export const PersonApiFp = function(configuration?: Configuration) {
 export const PersonApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     const localVarFp = PersonApiFp(configuration)
     return {
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createPerson(options?: AxiosRequestConfig): AxiosPromise<PersonResponseDto> {
-            return localVarFp.createPerson(options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {PersonApiGetAllPeopleRequest} requestParameters Request parameters.
@@ -14220,15 +13650,6 @@ export const PersonApiFactory = function (configuration?: Configuration, basePat
         mergePerson(requestParameters: PersonApiMergePersonRequest, options?: AxiosRequestConfig): AxiosPromise<Array<BulkIdResponseDto>> {
             return localVarFp.mergePerson(requestParameters.id, requestParameters.mergePersonDto, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @param {PersonApiReassignFacesRequest} requestParameters Request parameters.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        reassignFaces(requestParameters: PersonApiReassignFacesRequest, options?: AxiosRequestConfig): AxiosPromise<Array<PersonResponseDto>> {
-            return localVarFp.reassignFaces(requestParameters.id, requestParameters.assetFaceUpdateDto, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {PersonApiUpdatePeopleRequest} requestParameters Request parameters.
@@ -14341,27 +13762,6 @@ export interface PersonApiMergePersonRequest {
     readonly mergePersonDto: MergePersonDto
 }
 
-/**
- * Request parameters for reassignFaces operation in PersonApi.
- * @export
- * @interface PersonApiReassignFacesRequest
- */
-export interface PersonApiReassignFacesRequest {
-    /**
-     * 
-     * @type {string}
-     * @memberof PersonApiReassignFaces
-     */
-    readonly id: string
-
-    /**
-     * 
-     * @type {AssetFaceUpdateDto}
-     * @memberof PersonApiReassignFaces
-     */
-    readonly assetFaceUpdateDto: AssetFaceUpdateDto
-}
-
 /**
  * Request parameters for updatePeople operation in PersonApi.
  * @export
@@ -14404,16 +13804,6 @@ export interface PersonApiUpdatePersonRequest {
  * @extends {BaseAPI}
  */
 export class PersonApi extends BaseAPI {
-    /**
-     * 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof PersonApi
-     */
-    public createPerson(options?: AxiosRequestConfig) {
-        return PersonApiFp(this.configuration).createPerson(options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {PersonApiGetAllPeopleRequest} requestParameters Request parameters.
@@ -14480,17 +13870,6 @@ export class PersonApi extends BaseAPI {
         return PersonApiFp(this.configuration).mergePerson(requestParameters.id, requestParameters.mergePersonDto, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * 
-     * @param {PersonApiReassignFacesRequest} requestParameters Request parameters.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof PersonApi
-     */
-    public reassignFaces(requestParameters: PersonApiReassignFacesRequest, options?: AxiosRequestConfig) {
-        return PersonApiFp(this.configuration).reassignFaces(requestParameters.id, requestParameters.assetFaceUpdateDto, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {PersonApiUpdatePeopleRequest} requestParameters Request parameters.

cli/src/api/open-api/base.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.89.0
+ * The version of the OpenAPI document: 1.88.2
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

cli/src/api/open-api/common.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.89.0
+ * The version of the OpenAPI document: 1.88.2
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

cli/src/api/open-api/configuration.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.89.0
+ * The version of the OpenAPI document: 1.88.2
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

cli/src/api/open-api/index.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.89.0
+ * The version of the OpenAPI document: 1.88.2
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

docker/docker-compose.dev.yml

@@ -59,7 +59,7 @@ services:
     build:
       context: ../web
       dockerfile: Dockerfile
-    command: "node ./node_modules/.bin/vite dev --host 0.0.0.0 --port 3000"
+    command: npm run dev --host
     env_file:
       - .env
     ports:
@@ -108,11 +108,11 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:60e49e22fa5706cd8df7d5e0bc50ee9bab7c608039fa653c4d961014237cca46
+    image: redis:6.2-alpine@sha256:80cc8518800438c684a53ed829c621c94afd1087aaeb59b0d4343ed3e7bcf6c5
 
   database:
     container_name: immich_postgres
-    image: postgres:14-alpine@sha256:6a0e35296341e676fe6bd8d236c72afffe2dfe3d7eb9c2405c0f3fc04500cd07
+    image: postgres:14-alpine@sha256:50d9be76e9a90da4c781554955e0ffc79d9d5c4226838e64b36aacc97cbc35ad
     env_file:
       - .env
     environment:

docker/docker-compose.prod.yml

@@ -65,12 +65,12 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:60e49e22fa5706cd8df7d5e0bc50ee9bab7c608039fa653c4d961014237cca46
+    image: redis:6.2-alpine@sha256:80cc8518800438c684a53ed829c621c94afd1087aaeb59b0d4343ed3e7bcf6c5
     restart: always
 
   database:
     container_name: immich_postgres
-    image: postgres:14-alpine@sha256:6a0e35296341e676fe6bd8d236c72afffe2dfe3d7eb9c2405c0f3fc04500cd07
+    image: postgres:14-alpine@sha256:50d9be76e9a90da4c781554955e0ffc79d9d5c4226838e64b36aacc97cbc35ad
     env_file:
       - .env
     environment:

docker/docker-compose.test.yml

@@ -23,7 +23,7 @@ services:
       - database
 
   database:
-    image: postgres:14-alpine@sha256:6a0e35296341e676fe6bd8d236c72afffe2dfe3d7eb9c2405c0f3fc04500cd07
+    image: postgres:14-alpine@sha256:50d9be76e9a90da4c781554955e0ffc79d9d5c4226838e64b36aacc97cbc35ad
     command: -c fsync=off
     environment:
       POSTGRES_PASSWORD: postgres

docker/docker-compose.yml

@@ -69,12 +69,12 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:60e49e22fa5706cd8df7d5e0bc50ee9bab7c608039fa653c4d961014237cca46
+    image: redis:6.2-alpine@sha256:80cc8518800438c684a53ed829c621c94afd1087aaeb59b0d4343ed3e7bcf6c5
     restart: always
 
   database:
     container_name: immich_postgres
-    image: postgres:14-alpine@sha256:6a0e35296341e676fe6bd8d236c72afffe2dfe3d7eb9c2405c0f3fc04500cd07
+    image: postgres:14-alpine@sha256:50d9be76e9a90da4c781554955e0ffc79d9d5c4226838e64b36aacc97cbc35ad
     env_file:
       - .env
     environment:

docs/docs/guides/remote-access.md

@@ -1,58 +0,0 @@
-# Remote Access
-
-This page gives a few pointers on how to access your Immich instance from outside your LAN.
-
-:::danger
-Never forward port 2283 directly to the internet without additional configuration. This will expose the web interface via http to the internet, making you succeptible to [man in the middle](https://en.wikipedia.org/wiki/Man-in-the-middle_attack) attacks.
-:::
-
-## Option 1: VPN to home network
-
-You may use a VPN service to open an encrypted connection to your Immich instance. OpenVPN and Wireguard are two popular VPN solutions. Here is a guide on setting up VPN access to your server - [Pihole documentation](https://docs.pi-hole.net/guides/vpn/wireguard/overview/)
-
-### Pros:
-
-- Simple to set up and very secure.
-- Single point of potential failure, i.e., the VPN software itself. Even if there is a zero-day vulnerability on Immich, you will not be at risk.
-- Both Wireguard and OpenVPN are independently security-audited, so the risk of serious zero-day exploits are minimal.
-
-### Cons:
-
-- If you don't have a static IP address, you would need to set up a [Dynamic DNS](https://www.cloudflare.com/learning/dns/glossary/dynamic-dns/). [DuckDNS](https://www.duckdns.org/) is a free DDNS provider.
-- VPN software needs to be installed and active on both server-side and client-side.
-- Requires you to open a port on your router to your server.
-
-## Option 2: Tailscale
-
-If you are unable to open a port on your router for Wireguard or OpenVPN to your server, [Tailscale](https://tailscale.com/) is a good option. Tailscale mediates a peer-to-peer wireguard tunnel between your server and remote device, even if one or both of them are behind a [NAT firewall](https://en.wikipedia.org/wiki/Network_address_translation).
-
-### Pros
-
-- Minimal configuration needed on server and client sides.
-- You are protected against zero-day vulnerabilities on Immich.
-
-### Cons
-
-- The Tailscale client usually needs to run as root on your devices and it increases the attack surface slightly compared to a minimal Wireguard server. e.g., an [RCE vulnerability](https://github.com/tailscale/tailscale/security/advisories/GHSA-vqp6-rc3h-83cp) was discovered in the Windows Tailscale client in November 2022.
-- Tailscale is a paid service. However, there is a generous [free tier](https://tailscale.com/pricing/) that permits up to 3 users and up to 100 devices.
-- Tailscale needs to be installed and running on both server-side and client-side.
-
-## Option 3: Reverse Proxy
-
-A reverse proxy is a service that sits between web servers and clients. A reverse proxy can either be hosted on the server itself or remotely. Clients can connect to the reverse proxy via https, and the proxy relays data to Immich. This setup makes most sense if you have your own domain and want to access your Immich instance just like any other website, from outside your LAN. You can also use a DDNS provider like DuckDNS or no-ip if you don't have a domain. This configuration allows the Immich Android and iphone apps to connect to your server without a VPN or tailscale app on the client side.
-
-If you're hosting your own reverse proxy, [Nginx](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) is a great option. An example configuration for Nginx is provided [here](https://immich.app/docs/administration/reverse-proxy).
-
-You'll also need your own certificate to authenticate https connections. If you're making Immich publicly accesible, [Let's Encrypt](https://letsencrypt.org/) can provide a free certificate for your domain and is the recommended option. Alternatively, a [self-signed certificate](https://en.wikipedia.org/wiki/Self-signed_certificate) allows you to encrypt your connection to Immich, but it raises a security warning on the client's browser.
-
-A remote reverse proxy like [Cloudflare](https://www.cloudflare.com/learning/cdn/glossary/reverse-proxy/) increases security by hiding the server IP address, which makes targeted attacks like [DDoS](https://www.cloudflare.com/learning/ddos/what-is-a-ddos-attack/) harder.
-
-### Pros
-
-- No additional software needs to be installed client-side
-- If you only need access to the web interface remotely, it is possible to set up access controls that shield you from zero-day vulnerabilities on Immich. [Cloudflare Access](https://www.cloudflare.com/zero-trust/products/access/) has a generous free tier.
-
-### Cons
-
-- Complex configuration
-- Depending on your configuration, both the Immich web interface and API may be exposed to the internet. Immich is under very active developement and the existence of severe security vulnerabilities cannot be ruled out.

docs/docs/install/docker-compose.md

@@ -144,7 +144,7 @@ PUBLIC_LOGIN_PAGE_MESSAGE="My Family Photos and Videos Backup Server"
 From the directory you created in Step 1, (which should now contain your customized `docker-compose.yml` and `.env` files) run `docker-compose up -d`.
 
 ```bash title="Start the containers using docker compose command"
-docker compose up -d
+docker-compose up -d     # or `docker compose up -d` based on your docker-compose version
 ```
 
 :::tip
@@ -162,7 +162,7 @@ If `IMMICH_VERSION` is set, it will need to be updated to the latest or desired
 When a new version of Immich is [released](https://github.com/immich-app/immich/releases), the application can be upgraded with the following commands, run in the directory with the `docker-compose.yml` file:
 
 ```bash title="Upgrade Immich"
-docker compose pull && docker compose up -d
+docker-compose pull && docker-compose up -d     # Or `docker compose up -d`
 ```
 
 :::caution Automatic Updates

docs/package-lock.json

@@ -15,7 +15,7 @@
         "@mdx-js/react": "^1.6.22",
         "autoprefixer": "^10.4.13",
         "classnames": "^2.3.2",
-        "clsx": "^2.0.0",
+        "clsx": "^1.2.1",
         "docusaurus-lunr-search": "^2.3.2",
         "docusaurus-preset-openapi": "^0.6.3",
         "postcss": "^8.4.25",
@@ -28,7 +28,7 @@
       "devDependencies": {
         "@docusaurus/module-type-aliases": "^2.4.1",
         "@tsconfig/docusaurus": "^1.0.5",
-        "prettier": "^3.0.0",
+        "prettier": "^2.8.8",
         "typescript": "^5.1.6"
       },
       "engines": {
@@ -2603,14 +2603,6 @@
         "react-dom": "^16.8.4 || ^17.0.0"
       }
     },
-    "node_modules/@docusaurus/theme-classic/node_modules/clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@docusaurus/theme-common": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-2.4.3.tgz",
@@ -2641,14 +2633,6 @@
         "react-dom": "^16.8.4 || ^17.0.0"
       }
     },
-    "node_modules/@docusaurus/theme-common/node_modules/clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@docusaurus/theme-search-algolia": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.4.3.tgz",
@@ -2679,14 +2663,6 @@
         "react-dom": "^16.8.4 || ^17.0.0"
       }
     },
-    "node_modules/@docusaurus/theme-search-algolia/node_modules/clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@docusaurus/theme-translations": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-2.4.3.tgz",
@@ -4972,9 +4948,9 @@
       }
     },
     "node_modules/clsx": {
-      "version": "2.0.0",
+      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==",
+      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
       "engines": {
         "node": ">=6"
       }
@@ -6019,14 +5995,6 @@
         "react-dom": "^16.8.4 || ^17"
       }
     },
-    "node_modules/docusaurus-lunr-search/node_modules/clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/docusaurus-plugin-openapi": {
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/docusaurus-plugin-openapi/-/docusaurus-plugin-openapi-0.6.4.tgz",
@@ -6057,14 +6025,6 @@
         "react-dom": "^16.8.4 || ^17.0.0"
       }
     },
-    "node_modules/docusaurus-plugin-openapi/node_modules/clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/docusaurus-plugin-openapi/node_modules/fs-extra": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@@ -6138,14 +6098,6 @@
         "react-dom": "^16.8.4 || ^17.0.0"
       }
     },
-    "node_modules/docusaurus-theme-openapi/node_modules/clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/dom-converter": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
@@ -10849,15 +10801,15 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.1.0",
+      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
       "bin": {
-        "prettier": "bin/prettier.cjs"
+        "prettier": "bin-prettier.js"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=10.13.0"
       },
       "funding": {
         "url": "https://github.com/prettier/prettier?sponsor=1"
@@ -16793,13 +16745,6 @@
         "rtlcss": "^3.5.0",
         "tslib": "^2.4.0",
         "utility-types": "^3.10.0"
-      },
-      "dependencies": {
-        "clsx": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-          "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
-        }
       }
     },
     "@docusaurus/theme-common": {
@@ -16823,13 +16768,6 @@
         "tslib": "^2.4.0",
         "use-sync-external-store": "^1.2.0",
         "utility-types": "^3.10.0"
-      },
-      "dependencies": {
-        "clsx": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-          "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
-        }
       }
     },
     "@docusaurus/theme-search-algolia": {
@@ -16853,13 +16791,6 @@
         "lodash": "^4.17.21",
         "tslib": "^2.4.0",
         "utility-types": "^3.10.0"
-      },
-      "dependencies": {
-        "clsx": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-          "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
-        }
       }
     },
     "@docusaurus/theme-translations": {
@@ -18584,9 +18515,9 @@
       }
     },
     "clsx": {
-      "version": "2.0.0",
+      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q=="
+      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
     },
     "collapse-white-space": {
       "version": "1.0.6",
@@ -19312,13 +19243,6 @@
         "to-vfile": "^6.1.0",
         "unified": "^9.0.0",
         "unist-util-is": "^4.0.2"
-      },
-      "dependencies": {
-        "clsx": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-          "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
-        }
       }
     },
     "docusaurus-plugin-openapi": {
@@ -19344,11 +19268,6 @@
         "webpack": "^5.73.0"
       },
       "dependencies": {
-        "clsx": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-          "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
-        },
         "fs-extra": {
           "version": "9.1.0",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@@ -19402,13 +19321,6 @@
         "react-redux": "^7.2.0",
         "redux-devtools-extension": "^2.13.8",
         "webpack": "^5.73.0"
-      },
-      "dependencies": {
-        "clsx": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-          "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
-        }
       }
     },
     "dom-converter": {
@@ -22751,9 +22663,9 @@
       "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="
     },
     "prettier": {
-      "version": "3.1.0",
+      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true
     },
     "pretty-error": {

docs/package.json

@@ -24,7 +24,7 @@
     "@mdx-js/react": "^1.6.22",
     "autoprefixer": "^10.4.13",
     "classnames": "^2.3.2",
-    "clsx": "^2.0.0",
+    "clsx": "^1.2.1",
     "docusaurus-lunr-search": "^2.3.2",
     "docusaurus-preset-openapi": "^0.6.3",
     "postcss": "^8.4.25",
@@ -37,7 +37,7 @@
   "devDependencies": {
     "@docusaurus/module-type-aliases": "^2.4.1",
     "@tsconfig/docusaurus": "^1.0.5",
-    "prettier": "^3.0.0",
+    "prettier": "^2.8.8",
     "typescript": "^5.1.6"
   },
   "browserslist": {

docs/src/theme/SearchBar/algolia.css

@@ -61,12 +61,8 @@
 .searchbox__input {
   display: inline-block;
   box-sizing: border-box;
-  -webkit-transition:
+  -webkit-transition: box-shadow 0.4s ease, background 0.4s ease;
-    box-shadow 0.4s ease,
+  transition: box-shadow 0.4s ease, background 0.4s ease;
-    background 0.4s ease;
-  transition:
-    box-shadow 0.4s ease,
-    background 0.4s ease;
   border: 0;
   border-radius: 16px;
   box-shadow: inset 0 0 0 1px #cccccc;
@@ -247,9 +243,7 @@
 }
 
 .algolia-autocomplete .ds-dropdown-menu {
-  box-shadow:
+  box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
-    0 1px 0 0 rgba(0, 0, 0, 0.2),
-    0 2px 3px 0 rgba(0, 0, 0, 0.1);
 }
 
 @media (min-width: 601px) {

machine-learning/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-bookworm@sha256:ba7a7ac30c38e119c4304f98ef0e188f90f4f67a958bb6899da9defb99bfb471 as builder
+FROM python:3.11-bookworm as builder
 
 ENV PYTHONDONTWRITEBYTECODE=1 \
   PYTHONUNBUFFERED=1 \
@@ -13,7 +13,7 @@ ENV VIRTUAL_ENV="/opt/venv" PATH="/opt/venv/bin:${PATH}"
 COPY poetry.lock pyproject.toml ./
 RUN poetry install --sync --no-interaction --no-ansi --no-root --only main
 
-FROM python:3.11-slim-bookworm@sha256:cc758519481092eb5a4a5ab0c1b303e288880d59afc601958d19e95b300bc86b
+FROM python:3.11-slim-bookworm
 
 RUN apt-get update && apt-get install -y --no-install-recommends tini libmimalloc2.0 && rm -rf /var/lib/apt/lists/*
 

machine-learning/export/Dockerfile

@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:bookworm-slim@sha256:e296d47be09fc5d260eba9b191f60496f028a4f3ec41e8a14d48c0bae2c60244 as builder
+FROM mambaorg/micromamba:bookworm-slim as builder
 
 ENV NODE_ENV=production \
   TRANSFORMERS_CACHE=/cache \

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.89.0"
+version = "1.88.2"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"

mobile/analysis_options.yaml

@@ -49,6 +49,7 @@ dart_code_metrics:
     # Common
     - avoid-accessing-collections-by-constant-index
     - avoid-accessing-other-classes-private-members
+    - avoid-async-call-in-sync-function
     - avoid-cascade-after-if-null
     - avoid-collapsible-if
     - avoid-collection-methods-with-unrelated-types

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 113,
+        "android.injected.version.code" => 112,
-        "android.injected.version.name" => "1.89.0",
+        "android.injected.version.name" => "1.88.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')

mobile/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
-distributionSha256Sum=6001aba9b2204d26fa25a5800bb9382cf3ee01ccb78fe77317b2872336eb2f80
+distributionSha256Sum=518a863631feb7452b8f1b3dc2aaee5f388355cc3421bbd0275fbeadd77e84b2

mobile/assets/i18n/en-US.json

@@ -144,8 +144,6 @@
   "control_bottom_app_bar_stack": "Stack",
   "control_bottom_app_bar_unarchive": "Unarchive",
   "control_bottom_app_bar_upload": "Upload",
-  "control_bottom_app_bar_edit_time": "Edit Date & Time",
-  "control_bottom_app_bar_edit_location": "Edit Location",
   "create_album_page_untitled": "Untitled",
   "create_shared_album_page_create": "Create",
   "create_shared_album_page_share": "Share",
@@ -167,7 +165,6 @@
   "exif_bottom_sheet_description": "Add Description...",
   "exif_bottom_sheet_details": "DETAILS",
   "exif_bottom_sheet_location": "LOCATION",
-  "exif_bottom_sheet_location_add": "Add a location",
   "experimental_settings_new_asset_list_subtitle": "Work in progress",
   "experimental_settings_new_asset_list_title": "Enable experimental photo grid",
   "experimental_settings_subtitle": "Use at your own risk!",
@@ -464,18 +461,5 @@
   "viewer_remove_from_stack": "Remove from Stack",
   "viewer_stack_use_as_main_asset": "Use as Main Asset",
   "viewer_unstack": "Un-Stack",
-  "scaffold_body_error_occurred": "Error occurred",
+  "scaffold_body_error_occured": "Error occured"
-  "edit_date_time_dialog_date_time": "Date and Time",
-  "edit_date_time_dialog_timezone": "Timezone",
-  "action_common_cancel": "Cancel",
-  "action_common_update": "Update",
-  "edit_location_dialog_title": "Location",
-  "map_location_picker_page_use_location": "Use this location",
-  "location_picker_choose_on_map": "Choose on map",
-  "location_picker_latitude": "Latitude",
-  "location_picker_latitude_hint": "Enter your latitude here",
-  "location_picker_latitude_error": "Enter a valid latitude",
-  "location_picker_longitude": "Longitude",
-  "location_picker_longitude_hint": "Enter your longitude here",
-  "location_picker_longitude_error": "Enter a valid longitude"
 }

mobile/integration_test/test_utils/general_helper.dart

@@ -45,7 +45,7 @@ class ImmichTestHelper {
     await tester.pumpWidget(
       ProviderScope(
         overrides: [dbProvider.overrideWithValue(db)],
-        child: const app.MainWidget(),
+        child: app.getMainWidget(),
       ),
     );
     // Post run tasks

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Beta"
   lane :beta do
     increment_version_number(
-      version_number: "1.89.0"
+      version_number: "1.88.2"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/lib/constants/immich_colors.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
 
-const Color immichBackgroundColor = Color(0xFFf6f8fe);
+Color immichBackgroundColor = const Color(0xFFf6f8fe);
-const Color immichDarkBackgroundColor = Color.fromARGB(255, 0, 0, 0);
+Color immichDarkBackgroundColor = const Color.fromARGB(255, 0, 0, 0);
-const Color immichDarkThemePrimaryColor = Color.fromARGB(255, 173, 203, 250);
+Color immichDarkThemePrimaryColor = const Color.fromARGB(255, 173, 203, 250);

mobile/lib/extensions/asset_extensions.dart

@@ -1,36 +0,0 @@
-import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:timezone/timezone.dart';
-
-extension TZExtension on Asset {
-  /// Returns the created time of the asset from the exif info (if available) or from
-  /// the fileCreatedAt field, adjusted to the timezone value from the exif info along with
-  /// the timezone offset in [Duration]
-  (DateTime, Duration) getTZAdjustedTimeAndOffset() {
-    DateTime dt = fileCreatedAt.toLocal();
-    if (exifInfo?.dateTimeOriginal != null) {
-      dt = exifInfo!.dateTimeOriginal!;
-      if (exifInfo?.timeZone != null) {
-        dt = dt.toUtc();
-        try {
-          final location = getLocation(exifInfo!.timeZone!);
-          dt = TZDateTime.from(dt, location);
-        } on LocationNotFoundException {
-          RegExp re = RegExp(
-            r'^utc(?:([+-]\d{1,2})(?::(\d{2}))?)?$',
-            caseSensitive: false,
-          );
-          final m = re.firstMatch(exifInfo!.timeZone!);
-          if (m != null) {
-            final duration = Duration(
-              hours: int.parse(m.group(1) ?? '0'),
-              minutes: int.parse(m.group(2) ?? '0'),
-            );
-            dt = dt.add(duration);
-            return (dt, duration);
-          }
-        }
-      }
-    }
-    return (dt, dt.timeZoneOffset);
-  }
-}

mobile/lib/extensions/asyncvalue_extensions.dart

@@ -4,32 +4,22 @@ import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/scaffold_error_body.dart';
 import 'package:logging/logging.dart';
 
-extension LogOnError<T> on AsyncValue<T> {
+extension ScaffoldBody<T> on AsyncValue<T> {
-  static final Logger _asyncErrorLogger = Logger("AsyncValue");
+  static final Logger _scaffoldBodyLog = Logger("ScaffoldBody");
 
-  Widget widgetWhen({
+  Widget scaffoldBodyWhen({
-    bool skipLoadingOnRefresh = true,
-    Widget Function()? onLoading,
-    Widget Function(Object? error, StackTrace? stack)? onError,
     required Widget Function(T data) onData,
+    Widget? onError,
   }) {
     if (isLoading) {
-      bool skip = false;
+      return const Center(
-      if (isRefreshing) {
+        child: ImmichLoadingIndicator(),
-        skip = skipLoadingOnRefresh;
+      );
-      }
-
-      if (!skip) {
-        return onLoading?.call() ??
-            const Center(
-              child: ImmichLoadingIndicator(),
-            );
-      }
     }
 
     if (hasError && !hasValue) {
-      _asyncErrorLogger.severe("Error occured", error, stackTrace);
+      _scaffoldBodyLog.severe("Error occured in AsyncValue", error, stackTrace);
-      return onError?.call(error, stackTrace) ?? const ScaffoldErrorBody();
+      return onError ?? const ScaffoldErrorBody();
     }
 
     return onData(requireValue);

mobile/lib/extensions/build_context_extensions.dart

@@ -45,7 +45,7 @@ extension ContextHelper on BuildContext {
   ) =>
       AutoRouter.of(this).navigate(route);
 
-  // Auto-Push replace route from the current context
+// Auto-Push replace route from the current context
   Future<T?> autoReplace<T extends Object?>(PageRouteInfo<dynamic> route) =>
       AutoRouter.of(this).replace(route);
 

mobile/lib/extensions/duration_extensions.dart

@@ -1,4 +0,0 @@
-extension TZOffsetExtension on Duration {
-  String formatAsOffset() =>
-      "${isNegative ? '-' : '+'}${inHours.abs().toString().padLeft(2, '0')}:${inMinutes.abs().remainder(60).toString().padLeft(2, '0')}";
-}

mobile/lib/main.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:io';
 
 import 'package:device_info_plus/device_info_plus.dart';
@@ -8,7 +7,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:timezone/data/latest.dart';
 import 'package:immich_mobile/constants/locales.dart';
 import 'package:immich_mobile/modules/backup/background_service/background.service.dart';
@@ -30,6 +28,7 @@ import 'package:immich_mobile/shared/providers/app_state.provider.dart';
 import 'package:immich_mobile/shared/providers/db.provider.dart';
 import 'package:immich_mobile/shared/services/immich_logger.service.dart';
 import 'package:immich_mobile/shared/services/local_notification.service.dart';
+import 'package:immich_mobile/shared/views/immich_loading_overlay.dart';
 import 'package:immich_mobile/utils/http_ssl_cert_override.dart';
 import 'package:immich_mobile/utils/immich_app_theme.dart';
 import 'package:immich_mobile/utils/migration.dart';
@@ -44,11 +43,10 @@ void main() async {
   await initApp();
   await migrateDatabaseIfNeeded(db);
   HttpOverrides.global = HttpSSLCertOverride();
-
   runApp(
     ProviderScope(
       overrides: [dbProvider.overrideWithValue(db)],
-      child: const MainWidget(),
+      child: getMainWidget(),
     ),
   );
 }
@@ -110,6 +108,16 @@ Future<Isar> loadDb() async {
   return db;
 }
 
+Widget getMainWidget() {
+  return EasyLocalization(
+    supportedLocales: locales,
+    path: translationsPath,
+    useFallbackTranslations: true,
+    fallbackLocale: locales.first,
+    child: const ImmichApp(),
+  );
+}
+
 class ImmichApp extends ConsumerStatefulWidget {
   const ImmichApp({super.key});
 
@@ -159,9 +167,10 @@ class ImmichAppState extends ConsumerState<ImmichApp>
       // Android 8 does not support transparent app bars
       final info = await DeviceInfoPlugin().androidInfo;
       if (info.version.sdkInt <= 26) {
-        overlayStyle = context.isDarkTheme
+        overlayStyle =
-            ? SystemUiOverlayStyle.dark
+            MediaQuery.of(context).platformBrightness == Brightness.light
-            : SystemUiOverlayStyle.light;
+                ? SystemUiOverlayStyle.light
+                : SystemUiOverlayStyle.dark;
       }
     }
     SystemChrome.setSystemUIOverlayStyle(overlayStyle);
@@ -193,33 +202,22 @@ class ImmichAppState extends ConsumerState<ImmichApp>
       supportedLocales: context.supportedLocales,
       locale: context.locale,
       debugShowCheckedModeBanner: false,
-      home: MaterialApp.router(
+      home: Stack(
-        title: 'Immich',
+        children: [
-        debugShowCheckedModeBanner: false,
+          MaterialApp.router(
-        themeMode: ref.watch(immichThemeProvider),
+            title: 'Immich',
-        darkTheme: immichDarkTheme,
+            debugShowCheckedModeBanner: false,
-        theme: immichLightTheme,
+            themeMode: ref.watch(immichThemeProvider),
-        routeInformationParser: router.defaultRouteParser(),
+            darkTheme: immichDarkTheme,
-        routerDelegate: router.delegate(
+            theme: immichLightTheme,
-          navigatorObservers: () => [TabNavigationObserver(ref: ref)],
+            routeInformationParser: router.defaultRouteParser(),
-        ),
+            routerDelegate: router.delegate(
+              navigatorObservers: () => [TabNavigationObserver(ref: ref)],
+            ),
+          ),
+          const ImmichLoadingOverlay(),
+        ],
       ),
     );
   }
 }
-
-// ignore: prefer-single-widget-per-file
-class MainWidget extends StatelessWidget {
-  const MainWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return EasyLocalization(
-      supportedLocales: locales,
-      path: translationsPath,
-      useFallbackTranslations: true,
-      fallbackLocale: locales.first,
-      child: const ImmichApp(),
-    );
-  }
-}

mobile/lib/modules/activities/providers/activity.provider.dart

@@ -95,11 +95,7 @@ class ActivityStatisticsNotifier extends StateNotifier<int> {
   }
 
   Future<void> fetchStatistics() async {
-    final count =
+    state = await _activityService.getStatistics(albumId, assetId: assetId);
-        await _activityService.getStatistics(albumId, assetId: assetId);
-    if (mounted) {
-      state = count;
-    }
   }
 
   Future<void> addActivity() async {

mobile/lib/modules/activities/views/activities_page.dart

@@ -4,12 +4,12 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/activities/models/activity.model.dart';
 import 'package:immich_mobile/modules/activities/providers/activity.provider.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/shared/ui/confirm_dialog.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/user_circle_avatar.dart';
 import 'package:immich_mobile/extensions/datetime_extensions.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
@@ -88,7 +88,7 @@ class ActivitiesPage extends HookConsumerWidget {
               width: 40,
               height: 30,
               decoration: BoxDecoration(
-                borderRadius: const BorderRadius.all(Radius.circular(4)),
+                borderRadius: BorderRadius.circular(4),
                 image: DecorationImage(
                   image: CachedNetworkImageProvider(
                     getThumbnailUrlForRemoteId(
@@ -231,8 +231,11 @@ class ActivitiesPage extends HookConsumerWidget {
 
     return Scaffold(
       appBar: AppBar(title: Text(appBarTitle)),
-      body: activities.widgetWhen(
+      body: activities.maybeWhen(
-        onData: (data) {
+        orElse: () {
+          return const Center(child: ImmichLoadingIndicator());
+        },
+        data: (data) {
           final liked = data.firstWhereOrNull(
             (a) =>
                 a.type == ActivityType.like &&

mobile/lib/modules/album/ui/add_to_album_bottom_sheet.dart

@@ -65,7 +65,7 @@ class AddToAlbumBottomSheet extends HookConsumerWidget {
       }
 
       ref.invalidate(albumDetailProvider(album.id));
-      context.pop();
+      Navigator.pop(context);
     }
 
     return Card(

mobile/lib/modules/album/ui/album_thumbnail_listtile.dart

@@ -68,46 +68,46 @@ class AlbumThumbnailListTile extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             ClipRRect(
-              borderRadius: const BorderRadius.all(Radius.circular(8)),
+              borderRadius: BorderRadius.circular(8),
               child: album.thumbnail.value == null
                   ? buildEmptyThumbnail()
                   : buildAlbumThumbnail(),
             ),
-            Expanded(
+            Padding(
-              child: Padding(
+              padding: const EdgeInsets.only(
-                padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                left: 8.0,
-                child: Column(
+                right: 8.0,
-                  crossAxisAlignment: CrossAxisAlignment.start,
+              ),
-                  children: [
+              child: Column(
-                    Text(
+                crossAxisAlignment: CrossAxisAlignment.start,
-                      album.name,
+                children: [
-                      overflow: TextOverflow.ellipsis,
+                  Text(
-                      style: const TextStyle(
+                    album.name,
-                        fontWeight: FontWeight.bold,
+                    style: const TextStyle(
-                      ),
+                      fontWeight: FontWeight.bold,
                     ),
-                    Row(
+                  ),
-                      mainAxisSize: MainAxisSize.min,
+                  Row(
-                      children: [
+                    mainAxisSize: MainAxisSize.min,
-                        Text(
+                    children: [
-                          album.assetCount == 1
+                      Text(
-                              ? 'album_thumbnail_card_item'
+                        album.assetCount == 1
-                              : 'album_thumbnail_card_items',
+                            ? 'album_thumbnail_card_item'
-                          style: const TextStyle(
+                            : 'album_thumbnail_card_items',
+                        style: const TextStyle(
+                          fontSize: 12,
+                        ),
+                      ).tr(args: ['${album.assetCount}']),
+                      if (album.shared)
+                        const Text(
+                          'album_thumbnail_card_shared',
+                          style: TextStyle(
                             fontSize: 12,
                           ),
-                        ).tr(args: ['${album.assetCount}']),
+                        ).tr(),
-                        if (album.shared)
+                    ],
-                          const Text(
+                  ),
-                            'album_thumbnail_card_shared',
+                ],
-                            style: TextStyle(
-                              fontSize: 12,
-                            ),
-                          ).tr(),
-                      ],
-                    ),
-                  ],
-                ),
               ),
             ),
           ],

mobile/lib/modules/album/ui/album_viewer_appbar.dart

@@ -43,7 +43,6 @@ class AlbumViewerAppbar extends HookConsumerWidget
   Widget build(BuildContext context, WidgetRef ref) {
     final newAlbumTitle = ref.watch(albumViewerProvider).editTitleText;
     final isEditAlbum = ref.watch(albumViewerProvider).isEditAlbum;
-    final isProcessing = useProcessingOverlay();
     final comments = album.shared
         ? ref.watch(
             activityStatisticsStateProvider(
@@ -53,7 +52,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
         : 0;
 
     deleteAlbum() async {
-      isProcessing.value = true;
+      ImmichLoadingOverlayController.appLoader.show();
 
       final bool success;
       if (album.shared) {
@@ -75,7 +74,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
         );
       }
 
-      isProcessing.value = false;
+      ImmichLoadingOverlayController.appLoader.hide();
     }
 
     Future<void> showConfirmationDialog() async {
@@ -90,7 +89,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
             ),
             actions: <Widget>[
               TextButton(
-                onPressed: () => context.pop('Cancel'),
+                onPressed: () => Navigator.pop(context, 'Cancel'),
                 child: Text(
                   'Cancel',
                   style: TextStyle(
@@ -101,7 +100,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
               ),
               TextButton(
                 onPressed: () {
-                  context.pop('Confirm');
+                  Navigator.pop(context, 'Confirm');
                   deleteAlbum();
                 },
                 child: Text(
@@ -123,7 +122,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
     }
 
     void onLeaveAlbumPressed() async {
-      isProcessing.value = true;
+      ImmichLoadingOverlayController.appLoader.show();
 
       bool isSuccess =
           await ref.watch(sharedAlbumProvider.notifier).leaveAlbum(album);
@@ -132,7 +131,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
         context
             .autoNavigate(const TabControllerRoute(children: [SharingRoute()]));
       } else {
-        context.pop();
+        Navigator.pop(context);
         ImmichToast.show(
           context: context,
           msg: "album_viewer_appbar_share_err_leave".tr(),
@@ -141,11 +140,11 @@ class AlbumViewerAppbar extends HookConsumerWidget
         );
       }
 
-      isProcessing.value = false;
+      ImmichLoadingOverlayController.appLoader.hide();
     }
 
     void onRemoveFromAlbumPressed() async {
-      isProcessing.value = true;
+      ImmichLoadingOverlayController.appLoader.show();
 
       bool isSuccess =
           await ref.watch(sharedAlbumProvider.notifier).removeAssetFromAlbum(
@@ -154,12 +153,12 @@ class AlbumViewerAppbar extends HookConsumerWidget
               );
 
       if (isSuccess) {
-        context.pop();
+        Navigator.pop(context);
         selectionDisabled();
         ref.watch(albumProvider.notifier).getAllAlbums();
         ref.invalidate(albumDetailProvider(album.id));
       } else {
-        context.pop();
+        Navigator.pop(context);
         ImmichToast.show(
           context: context,
           msg: "album_viewer_appbar_share_err_remove".tr(),
@@ -168,7 +167,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
         );
       }
 
-      isProcessing.value = false;
+      ImmichLoadingOverlayController.appLoader.hide();
     }
 
     void handleShareAssets(
@@ -199,9 +198,9 @@ class AlbumViewerAppbar extends HookConsumerWidget
     }
 
     void onShareAssetsTo() async {
-      isProcessing.value = true;
+      ImmichLoadingOverlayController.appLoader.show();
       handleShareAssets(ref, context, selected);
-      isProcessing.value = false;
+      ImmichLoadingOverlayController.appLoader.hide();
     }
 
     buildBottomSheetActions() {
@@ -254,7 +253,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
         ListTile(
           leading: const Icon(Icons.person_add_alt_rounded),
           onTap: () {
-            context.pop();
+            Navigator.pop(context);
             onAddUsers!(album);
           },
           title: const Text(
@@ -266,7 +265,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
           leading: const Icon(Icons.share_rounded),
           onTap: () {
             context.autoPush(SharedLinkEditRoute(albumId: album.remoteId));
-            context.pop();
+            Navigator.pop(context);
           },
           title: const Text(
             "control_bottom_app_bar_share",
@@ -287,7 +286,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
         ListTile(
           leading: const Icon(Icons.add_photo_alternate_outlined),
           onTap: () {
-            context.pop();
+            Navigator.pop(context);
             onAddPhotos!(album);
           },
           title: const Text(

mobile/lib/modules/album/views/album_options_part.dart

@@ -24,11 +24,10 @@ class AlbumOptionsPage extends HookConsumerWidget {
     final owner = album.owner.value;
     final userId = ref.watch(authenticationProvider).userId;
     final activityEnabled = useState(album.activityEnabled);
-    final isProcessing = useProcessingOverlay();
     final isOwner = owner?.id == userId;
 
     void showErrorMessage() {
-      context.pop();
+      Navigator.pop(context);
       ImmichToast.show(
         context: context,
         msg: "shared_album_section_people_action_error".tr(),
@@ -38,7 +37,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
     }
 
     void leaveAlbum() async {
-      isProcessing.value = true;
+      ImmichLoadingOverlayController.appLoader.show();
 
       try {
         final isSuccess =
@@ -55,11 +54,11 @@ class AlbumOptionsPage extends HookConsumerWidget {
         showErrorMessage();
       }
 
-      isProcessing.value = false;
+      ImmichLoadingOverlayController.appLoader.hide();
     }
 
     void removeUserFromAlbum(User user) async {
-      isProcessing.value = true;
+      ImmichLoadingOverlayController.appLoader.show();
 
       try {
         await ref
@@ -71,8 +70,8 @@ class AlbumOptionsPage extends HookConsumerWidget {
         showErrorMessage();
       }
 
-      context.pop();
+      Navigator.pop(context);
-      isProcessing.value = false;
+      ImmichLoadingOverlayController.appLoader.hide();
     }
 
     void handleUserClick(User user) {
@@ -181,7 +180,9 @@ class AlbumOptionsPage extends HookConsumerWidget {
       appBar: AppBar(
         leading: IconButton(
           icon: const Icon(Icons.arrow_back_ios_new_rounded),
-          onPressed: () => context.autoPop(null),
+          onPressed: () {
+            context.autoPop(null);
+          },
         ),
         centerTitle: true,
         title: Text("translated_text_options".tr()),

mobile/lib/modules/album/views/album_viewer_page.dart

@@ -4,7 +4,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart';
 import 'package:immich_mobile/modules/album/providers/album_detail.provider.dart';
@@ -18,6 +17,7 @@ import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/album.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/user_circle_avatar.dart';
 import 'package:immich_mobile/shared/views/immich_loading_overlay.dart';
 
@@ -33,7 +33,6 @@ class AlbumViewerPage extends HookConsumerWidget {
     final userId = ref.watch(authenticationProvider).userId;
     final selection = useState<Set<Asset>>({});
     final multiSelectEnabled = useState(false);
-    final isProcessing = useProcessingOverlay();
 
     useEffect(
       () {
@@ -76,21 +75,24 @@ class AlbumViewerPage extends HookConsumerWidget {
         ),
       );
 
-      if (returnPayload != null && returnPayload.selectedAssets.isNotEmpty) {
+      if (returnPayload != null) {
         // Check if there is new assets add
-        isProcessing.value = true;
+        if (returnPayload.selectedAssets.isNotEmpty) {
+          ImmichLoadingOverlayController.appLoader.show();
 
-        var addAssetsResult =
+          var addAssetsResult =
-            await ref.watch(albumServiceProvider).addAdditionalAssetToAlbum(
+              await ref.watch(albumServiceProvider).addAdditionalAssetToAlbum(
-                  returnPayload.selectedAssets,
+                    returnPayload.selectedAssets,
-                  albumInfo,
+                    albumInfo,
-                );
+                  );
 
-        if (addAssetsResult != null && addAssetsResult.successfullyAdded > 0) {
+          if (addAssetsResult != null &&
-          ref.invalidate(albumDetailProvider(albumId));
+              addAssetsResult.successfullyAdded > 0) {
+            ref.invalidate(albumDetailProvider(albumId));
+          }
+
+          ImmichLoadingOverlayController.appLoader.hide();
         }
-
-        isProcessing.value = false;
       }
     }
 
@@ -100,7 +102,7 @@ class AlbumViewerPage extends HookConsumerWidget {
       );
 
       if (sharedUserIds != null) {
-        isProcessing.value = true;
+        ImmichLoadingOverlayController.appLoader.show();
 
         var isSuccess = await ref
             .watch(albumServiceProvider)
@@ -110,7 +112,7 @@ class AlbumViewerPage extends HookConsumerWidget {
           ref.invalidate(albumDetailProvider(album.id));
         }
 
-        isProcessing.value = false;
+        ImmichLoadingOverlayController.appLoader.hide();
       }
     }
 
@@ -258,11 +260,13 @@ class AlbumViewerPage extends HookConsumerWidget {
         error: (error, stackTrace) => AppBar(title: const Text("Error")),
         loading: () => AppBar(),
       ),
-      body: album.widgetWhen(
+      body: album.when(
-        onData: (data) => WillPopScope(
+        data: (data) => WillPopScope(
           onWillPop: onWillPop,
           child: GestureDetector(
-            onTap: () => titleFocusNode.unfocus(),
+            onTap: () {
+              titleFocusNode.unfocus();
+            },
             child: ImmichAssetGrid(
               renderList: data.renderList,
               listener: selectionListener,
@@ -281,6 +285,10 @@ class AlbumViewerPage extends HookConsumerWidget {
             ),
           ),
         ),
+        error: (e, _) => Center(child: Text("Error loading album info!\n$e")),
+        loading: () => const Center(
+          child: ImmichLoadingIndicator(),
+        ),
       ),
     );
   }

mobile/lib/modules/album/views/asset_selection_page.dart

@@ -3,7 +3,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/render_list.provider.dart';
@@ -86,8 +85,12 @@ class AssetSelectionPage extends HookConsumerWidget {
             ),
         ],
       ),
-      body: renderList.widgetWhen(
+      body: renderList.when(
-        onData: (data) => buildBody(data),
+        data: (data) => buildBody(data),
+        error: (error, stackTrace) => Center(
+          child: Text(error.toString()),
+        ),
+        loading: () => const Center(child: CircularProgressIndicator()),
       ),
     );
   }

mobile/lib/modules/album/views/library_page.dart

@@ -135,56 +135,49 @@ class LibraryPage extends HookConsumerWidget {
     }
 
     Widget buildCreateAlbumButton() {
-      return LayoutBuilder(
+      return GestureDetector(
-        builder: (context, constraints) {
+        onTap: () {
-          var cardSize = constraints.maxWidth;
+          context.autoPush(CreateAlbumRoute(isSharedAlbum: false));
-
-          return GestureDetector(
-            onTap: () {
-              context.autoPush(CreateAlbumRoute(isSharedAlbum: false));
-            },
-            child: Padding(
-              padding:
-                  const EdgeInsets.only(bottom: 32), // Adjust padding to suit
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.start,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Container(
-                    width: cardSize,
-                    height: cardSize,
-                    decoration: BoxDecoration(
-                      border: Border.all(
-                        color: isDarkTheme
-                            ? const Color.fromARGB(255, 53, 53, 53)
-                            : const Color.fromARGB(255, 203, 203, 203),
-                      ),
-                      color: isDarkTheme ? Colors.grey[900] : Colors.grey[50],
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                    child: Center(
-                      child: Icon(
-                        Icons.add_rounded,
-                        size: 28,
-                        color: context.primaryColor,
-                      ),
-                    ),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      top: 8.0,
-                      bottom: 16,
-                    ),
-                    child: Text(
-                      'library_page_new_album',
-                      style: context.textTheme.labelLarge,
-                    ).tr(),
-                  ),
-                ],
-              ),
-            ),
-          );
         },
+        child: Padding(
+          padding: const EdgeInsets.only(bottom: 32),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Expanded(
+                child: Container(
+                  decoration: BoxDecoration(
+                    border: Border.all(
+                      color: isDarkTheme
+                          ? const Color.fromARGB(255, 53, 53, 53)
+                          : const Color.fromARGB(255, 203, 203, 203),
+                    ),
+                    color: isDarkTheme ? Colors.grey[900] : Colors.grey[50],
+                    borderRadius: BorderRadius.circular(20),
+                  ),
+                  child: Center(
+                    child: Icon(
+                      Icons.add_rounded,
+                      size: 28,
+                      color: context.primaryColor,
+                    ),
+                  ),
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.only(
+                  top: 8.0,
+                  bottom: 16,
+                ),
+                child: Text(
+                  'library_page_new_album',
+                  style: context.textTheme.labelLarge,
+                ).tr(),
+              ),
+            ],
+          ),
+        ),
       );
     }
 

mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart

@@ -2,11 +2,11 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/suggested_shared_users.provider.dart';
 import 'package:immich_mobile/shared/models/album.dart';
 import 'package:immich_mobile/shared/models/user.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/user_circle_avatar.dart';
 
 class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
@@ -137,8 +137,8 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
           ),
         ],
       ),
-      body: suggestedShareUsers.widgetWhen(
+      body: suggestedShareUsers.when(
-        onData: (users) {
+        data: (users) {
           for (var sharedUsers in album.sharedUsers) {
             users.removeWhere(
               (u) => u.id == sharedUsers.id || u.id == album.ownerId,
@@ -147,6 +147,10 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
 
           return buildUserList(users);
         },
+        error: (e, _) => Text("Error loading suggested users $e"),
+        loading: () => const Center(
+          child: ImmichLoadingIndicator(),
+        ),
       ),
     );
   }

mobile/lib/modules/album/views/select_user_for_sharing_page.dart

@@ -2,7 +2,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/album_title.provider.dart';
 import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
@@ -10,6 +9,7 @@ import 'package:immich_mobile/modules/album/providers/suggested_shared_users.pro
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/user.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/user_circle_avatar.dart';
 
 class SelectUserForSharingPage extends HookConsumerWidget {
@@ -42,12 +42,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
 
       ScaffoldMessenger(
         child: SnackBar(
-          content: Text(
+          content: const Text('select_user_for_sharing_page_err_album').tr(),
-            'select_user_for_sharing_page_err_album',
-            style: context.textTheme.bodyLarge?.copyWith(
-              color: context.primaryColor,
-            ),
-          ).tr(),
         ),
       );
     }
@@ -171,10 +166,14 @@ class SelectUserForSharingPage extends HookConsumerWidget {
           ),
         ],
       ),
-      body: suggestedShareUsers.widgetWhen(
+      body: suggestedShareUsers.when(
-        onData: (users) {
+        data: (users) {
           return buildUserList(users);
         },
+        error: (e, _) => Text("Error loading suggested users $e"),
+        loading: () => const Center(
+          child: ImmichLoadingIndicator(),
+        ),
       ),
     );
   }

mobile/lib/modules/archive/views/archive_page.dart

@@ -2,7 +2,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/archive/providers/archive_asset_provider.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
@@ -49,33 +48,37 @@ class ArchivePage extends HookConsumerWidget {
           child: SizedBox(
             height: 64,
             child: Card(
-              child: ListTile(
+              child: Column(
-                shape: const RoundedRectangleBorder(
+                children: [
-                  borderRadius: BorderRadius.all(Radius.circular(10)),
+                  ListTile(
-                ),
+                    shape: RoundedRectangleBorder(
-                leading: const Icon(
+                      borderRadius: BorderRadius.circular(10),
-                  Icons.unarchive_rounded,
+                    ),
-                ),
+                    leading: const Icon(
-                title: Text(
+                      Icons.unarchive_rounded,
-                  'control_bottom_app_bar_unarchive'.tr(),
+                    ),
-                  style: const TextStyle(fontSize: 14),
+                    title: Text(
-                ),
+                      'control_bottom_app_bar_unarchive'.tr(),
-                onTap: processing.value
+                      style: const TextStyle(fontSize: 14),
-                    ? null
+                    ),
-                    : () async {
+                    onTap: processing.value
-                        processing.value = true;
+                        ? null
-                        try {
+                        : () async {
-                          await handleArchiveAssets(
+                            processing.value = true;
-                            ref,
+                            try {
-                            context,
+                              await handleArchiveAssets(
-                            selection.value.toList(),
+                                ref,
-                            shouldArchive: false,
+                                context,
-                          );
+                                selection.value.toList(),
-                        } finally {
+                                shouldArchive: false,
-                          processing.value = false;
+                              );
-                          selectionEnabledHook.value = false;
+                            } finally {
-                        }
+                              processing.value = false;
-                      },
+                              selectionEnabledHook.value = false;
+                            }
+                          },
+                  ),
+                ],
               ),
             ),
           ),
@@ -83,13 +86,18 @@ class ArchivePage extends HookConsumerWidget {
       );
     }
 
-    return Scaffold(
+    return archivedAssets.when(
-      appBar: archivedAssets.maybeWhen(
+      loading: () => Scaffold(
-        data: (data) => buildAppBar(data.totalAssets.toString()),
+        appBar: buildAppBar("?"),
-        orElse: () => buildAppBar("?"),
+        body: const Center(child: CircularProgressIndicator()),
       ),
-      body: archivedAssets.widgetWhen(
+      error: (error, stackTrace) => Scaffold(
-        onData: (data) => data.isEmpty
+        appBar: buildAppBar("Error"),
+        body: Center(child: Text(error.toString())),
+      ),
+      data: (data) => Scaffold(
+        appBar: buildAppBar(data.totalAssets.toString()),
+        body: data.isEmpty
             ? Center(
                 child: Text('archive_page_no_archived_assets'.tr()),
               )

mobile/lib/modules/asset_viewer/ui/advanced_bottom_sheet.dart

@@ -62,14 +62,8 @@ class AdvancedBottomSheet extends HookConsumerWidget {
                                   ClipboardData(text: assetDetail.toString()),
                                 ).then((_) {
                                   ScaffoldMessenger.of(context).showSnackBar(
-                                    SnackBar(
+                                    const SnackBar(
-                                      content: Text(
+                                      content: Text("Copied to clipboard"),
-                                        "Copied to clipboard",
-                                        style: context.textTheme.bodyLarge
-                                            ?.copyWith(
-                                          color: context.primaryColor,
-                                        ),
-                                      ),
                                     ),
                                   );
                                 });

mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart

@@ -4,15 +4,14 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asset_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/duration_extensions.dart';
+import 'package:timezone/timezone.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/description_input.dart';
 import 'package:immich_mobile/modules/map/ui/map_thumbnail.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
+import 'package:immich_mobile/shared/models/exif_info.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
 import 'package:immich_mobile/shared/ui/drag_sheet.dart';
-import 'package:immich_mobile/utils/selection_handlers.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -22,84 +21,111 @@ class ExifBottomSheet extends HookConsumerWidget {
 
   const ExifBottomSheet({Key? key, required this.asset}) : super(key: key);
 
+  bool hasCoordinates(ExifInfo? exifInfo) =>
+      exifInfo != null &&
+      exifInfo.latitude != null &&
+      exifInfo.longitude != null &&
+      exifInfo.latitude != 0 &&
+      exifInfo.longitude != 0;
+
+  String formatTimeZone(Duration d) =>
+      "GMT${d.isNegative ? '-' : '+'}${d.inHours.abs().toString().padLeft(2, '0')}:${d.inMinutes.abs().remainder(60).toString().padLeft(2, '0')}";
+
+  String get formattedDateTime {
+    DateTime dt = asset.fileCreatedAt.toLocal();
+    String? timeZone;
+    if (asset.exifInfo?.dateTimeOriginal != null) {
+      dt = asset.exifInfo!.dateTimeOriginal!;
+      if (asset.exifInfo?.timeZone != null) {
+        dt = dt.toUtc();
+        try {
+          final location = getLocation(asset.exifInfo!.timeZone!);
+          dt = TZDateTime.from(dt, location);
+        } on LocationNotFoundException {
+          RegExp re = RegExp(
+            r'^utc(?:([+-]\d{1,2})(?::(\d{2}))?)?$',
+            caseSensitive: false,
+          );
+          final m = re.firstMatch(asset.exifInfo!.timeZone!);
+          if (m != null) {
+            final duration = Duration(
+              hours: int.parse(m.group(1) ?? '0'),
+              minutes: int.parse(m.group(2) ?? '0'),
+            );
+            dt = dt.add(duration);
+            timeZone = formatTimeZone(duration);
+          }
+        }
+      }
+    }
+
+    final date = DateFormat.yMMMEd().format(dt);
+    final time = DateFormat.jm().format(dt);
+    timeZone ??= formatTimeZone(dt.timeZoneOffset);
+
+    return '$date • $time $timeZone';
+  }
+
+  Future<Uri?> _createCoordinatesUri(ExifInfo? exifInfo) async {
+    if (!hasCoordinates(exifInfo)) {
+      return null;
+    }
+
+    final double latitude = exifInfo!.latitude!;
+    final double longitude = exifInfo.longitude!;
+
+    const zoomLevel = 16;
+
+    if (Platform.isAndroid) {
+      Uri uri = Uri(
+        scheme: 'geo',
+        host: '$latitude,$longitude',
+        queryParameters: {
+          'z': '$zoomLevel',
+          'q': '$latitude,$longitude($formattedDateTime)',
+        },
+      );
+      if (await canLaunchUrl(uri)) {
+        return uri;
+      }
+    } else if (Platform.isIOS) {
+      var params = {
+        'll': '$latitude,$longitude',
+        'q': formattedDateTime,
+        'z': '$zoomLevel',
+      };
+      Uri uri = Uri.https('maps.apple.com', '/', params);
+      if (await canLaunchUrl(uri)) {
+        return uri;
+      }
+    }
+
+    return Uri(
+      scheme: 'https',
+      host: 'openstreetmap.org',
+      queryParameters: {'mlat': '$latitude', 'mlon': '$longitude'},
+      fragment: 'map=$zoomLevel/$latitude/$longitude',
+    );
+  }
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final assetWithExif = ref.watch(assetDetailProvider(asset));
     final exifInfo = (assetWithExif.value ?? asset).exifInfo;
     var textColor = context.isDarkTheme ? Colors.white : Colors.black;
 
-    bool hasCoordinates() =>
-        exifInfo != null &&
-        exifInfo.latitude != null &&
-        exifInfo.longitude != null &&
-        exifInfo.latitude != 0 &&
-        exifInfo.longitude != 0;
-
-    String formattedDateTime() {
-      final (dt, timeZone) =
-          (assetWithExif.value ?? asset).getTZAdjustedTimeAndOffset();
-      final date = DateFormat.yMMMEd().format(dt);
-      final time = DateFormat.jm().format(dt);
-
-      return '$date • $time GMT${timeZone.formatAsOffset()}';
-    }
-
-    Future<Uri?> createCoordinatesUri() async {
-      if (!hasCoordinates()) {
-        return null;
-      }
-
-      final double latitude = exifInfo!.latitude!;
-      final double longitude = exifInfo.longitude!;
-
-      const zoomLevel = 16;
-
-      if (Platform.isAndroid) {
-        Uri uri = Uri(
-          scheme: 'geo',
-          host: '$latitude,$longitude',
-          queryParameters: {
-            'z': '$zoomLevel',
-            'q': '$latitude,$longitude($formattedDateTime)',
-          },
-        );
-        if (await canLaunchUrl(uri)) {
-          return uri;
-        }
-      } else if (Platform.isIOS) {
-        var params = {
-          'll': '$latitude,$longitude',
-          'q': formattedDateTime,
-          'z': '$zoomLevel',
-        };
-        Uri uri = Uri.https('maps.apple.com', '/', params);
-        if (await canLaunchUrl(uri)) {
-          return uri;
-        }
-      }
-
-      return Uri(
-        scheme: 'https',
-        host: 'openstreetmap.org',
-        queryParameters: {'mlat': '$latitude', 'mlon': '$longitude'},
-        fragment: 'map=$zoomLevel/$latitude/$longitude',
-      );
-    }
-
     buildMap() {
       return Padding(
         padding: const EdgeInsets.symmetric(vertical: 16.0),
         child: LayoutBuilder(
           builder: (context, constraints) {
             return MapThumbnail(
-              showAttribution: false,
               coords: LatLng(
                 exifInfo?.latitude ?? 0,
                 exifInfo?.longitude ?? 0,
               ),
               height: 150,
-              width: constraints.maxWidth,
+              zoom: 16.0,
-              zoom: 12.0,
               markers: [
                 Marker(
                   anchorPos: AnchorPos.align(AnchorAlign.top),
@@ -113,7 +139,7 @@ class ExifBottomSheet extends HookConsumerWidget {
                 ),
               ],
               onTap: (tapPosition, latLong) async {
-                Uri? uri = await createCoordinatesUri();
+                Uri? uri = await _createCoordinatesUri(exifInfo);
 
                 if (uri == null) {
                   return;
@@ -155,26 +181,8 @@ class ExifBottomSheet extends HookConsumerWidget {
 
     buildLocation() {
       // Guard no lat/lng
-      if (!hasCoordinates()) {
+      if (!hasCoordinates(exifInfo)) {
-        return asset.isRemote
+        return Container();
-            ? ListTile(
-                minLeadingWidth: 0,
-                contentPadding: const EdgeInsets.all(0),
-                leading: const Icon(Icons.location_on),
-                title: Text(
-                  "exif_bottom_sheet_location_add",
-                  style: context.textTheme.bodyMedium?.copyWith(
-                    fontWeight: FontWeight.w600,
-                    color: context.primaryColor,
-                  ),
-                ).tr(),
-                onTap: () => handleEditLocation(
-                  ref,
-                  context,
-                  [assetWithExif.value ?? asset],
-                ),
-              )
-            : const SizedBox.shrink();
       }
 
       return Column(
@@ -183,29 +191,13 @@ class ExifBottomSheet extends HookConsumerWidget {
           Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Row(
+              Text(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                "exif_bottom_sheet_location",
-                children: [
+                style: context.textTheme.labelMedium?.copyWith(
-                  Text(
+                  color: context.textTheme.labelMedium?.color?.withAlpha(200),
-                    "exif_bottom_sheet_location",
+                  fontWeight: FontWeight.w600,
-                    style: context.textTheme.labelMedium?.copyWith(
+                ),
-                      color:
+              ).tr(),
-                          context.textTheme.labelMedium?.color?.withAlpha(200),
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ).tr(),
-                  if (asset.isRemote)
-                    IconButton(
-                      onPressed: () => handleEditLocation(
-                        ref,
-                        context,
-                        [assetWithExif.value ?? asset],
-                      ),
-                      icon: const Icon(Icons.edit_outlined),
-                      iconSize: 20,
-                    ),
-                ],
-              ),
               buildMap(),
               RichText(
                 text: TextSpan(
@@ -241,27 +233,12 @@ class ExifBottomSheet extends HookConsumerWidget {
     }
 
     buildDate() {
-      return Row(
+      return Text(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        formattedDateTime,
-        children: [
+        style: const TextStyle(
-          Text(
+          fontWeight: FontWeight.bold,
-            formattedDateTime(),
+          fontSize: 14,
-            style: const TextStyle(
+        ),
-              fontWeight: FontWeight.bold,
-              fontSize: 14,
-            ),
-          ),
-          if (asset.isRemote)
-            IconButton(
-              onPressed: () => handleEditDateTime(
-                ref,
-                context,
-                [assetWithExif.value ?? asset],
-              ),
-              icon: const Icon(Icons.edit_outlined),
-              iconSize: 20,
-            ),
-        ],
       );
     }
 
@@ -386,7 +363,7 @@ class ExifBottomSheet extends HookConsumerWidget {
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
                             Flexible(
-                              flex: hasCoordinates() ? 5 : 0,
+                              flex: hasCoordinates(exifInfo) ? 5 : 0,
                               child: Padding(
                                 padding: const EdgeInsets.only(right: 8.0),
                                 child: buildLocation(),
@@ -425,8 +402,9 @@ class ExifBottomSheet extends HookConsumerWidget {
                         child: CircularProgressIndicator.adaptive(),
                       ),
                     ),
+                    const SizedBox(height: 8.0),
                     buildLocation(),
-                    SizedBox(height: hasCoordinates() ? 16.0 : 6.0),
+                    SizedBox(height: hasCoordinates(exifInfo) ? 16.0 : 0.0),
                     buildDetail(),
                     const SizedBox(height: 50),
                   ],

mobile/lib/modules/asset_viewer/views/gallery_viewer.dart

@@ -514,7 +514,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                               currentAsset,
                               stackElements.elementAt(stackIndex.value),
                             );
-                        ctx.pop();
+                        Navigator.pop(ctx);
                         context.autoPop();
                       },
                       title: const Text(
@@ -541,7 +541,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                           stackElements.elementAt(1),
                           childrenToRemove: [currentAsset],
                         );
-                        ctx.pop();
+                        Navigator.pop(ctx);
                         context.autoPop();
                       } else {
                         await ref.read(assetStackServiceProvider).updateStack(
@@ -551,7 +551,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                           ],
                         );
                         removeAssetFromStack();
-                        ctx.pop();
+                        Navigator.pop(ctx);
                       }
                     },
                     title: const Text(
@@ -569,7 +569,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                             currentAsset,
                             childrenToRemove: stack,
                           );
-                      ctx.pop();
+                      Navigator.pop(ctx);
                       context.autoPop();
                     },
                     title: const Text(
@@ -795,7 +795,6 @@ class GalleryViewerPage extends HookConsumerWidget {
                       tag: isFromDto
                           ? '${a.remoteId}-$heroOffset'
                           : a.id + heroOffset,
-                      transitionOnUserGestures: true,
                     ),
                     filterQuality: FilterQuality.high,
                     tightMode: true,

mobile/lib/modules/backup/providers/backup.provider.dart

@@ -375,8 +375,6 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       await _getBackupAlbumsInfo();
       await updateServerInfo();
       await _updateBackupAssetCount();
-    } else {
-      log.warning("cannot get backup info - background backup is in progress!");
     }
   }
 

mobile/lib/modules/backup/views/backup_controller_page.dart

@@ -229,9 +229,6 @@ class BackupControllerPage extends HookConsumerWidget {
       final snackBar = SnackBar(
         content: Text(
           msg.tr(),
-          style: context.textTheme.bodyLarge?.copyWith(
-            color: context.primaryColor,
-          ),
         ),
         backgroundColor: Colors.red,
       );

mobile/lib/modules/favorite/views/favorites_page.dart

@@ -2,7 +2,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/favorite/providers/favorite_provider.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
@@ -63,18 +62,22 @@ class FavoritesPage extends HookConsumerWidget {
           child: SizedBox(
             height: 64,
             child: Card(
-              child: ListTile(
+              child: Column(
-                shape: const RoundedRectangleBorder(
+                children: [
-                  borderRadius: BorderRadius.all(Radius.circular(10)),
+                  ListTile(
-                ),
+                    shape: RoundedRectangleBorder(
-                leading: const Icon(
+                      borderRadius: BorderRadius.circular(10),
-                  Icons.star_border,
+                    ),
-                ),
+                    leading: const Icon(
-                title: const Text(
+                      Icons.star_border,
-                  "Unfavorite",
+                    ),
-                  style: TextStyle(fontSize: 14),
+                    title: const Text(
-                ),
+                      "Unfavorite",
-                onTap: processing.value ? null : unfavorite,
+                      style: TextStyle(fontSize: 14),
+                    ),
+                    onTap: processing.value ? null : unfavorite,
+                  ),
+                ],
               ),
             ),
           ),
@@ -84,8 +87,10 @@ class FavoritesPage extends HookConsumerWidget {
 
     return Scaffold(
       appBar: buildAppBar(),
-      body: ref.watch(favoriteAssetsProvider).widgetWhen(
+      body: ref.watch(favoriteAssetsProvider).when(
-            onData: (data) => data.isEmpty
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error: (error, stackTrace) => Center(child: Text(error.toString())),
+            data: (data) => data.isEmpty
                 ? Center(
                     child: Text('favorites_page_no_favorites'.tr()),
                   )

mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart

@@ -5,13 +5,13 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/render_list.provider.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid_view.dart';
 import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
 import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 class ImmichAssetGrid extends HookConsumerWidget {
@@ -130,8 +130,12 @@ class ImmichAssetGrid extends HookConsumerWidget {
     if (renderList != null) return buildAssetGridView(renderList!);
 
     final renderListFuture = ref.watch(renderListProvider(assets!));
-    return renderListFuture.widgetWhen(
+    return renderListFuture.when(
-      onData: (renderList) => buildAssetGridView(renderList),
+      data: (renderList) => buildAssetGridView(renderList),
+      error: (err, stack) => Center(child: Text("$err")),
+      loading: () => const Center(
+        child: ImmichLoadingIndicator(),
+      ),
     );
   }
 }

mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart

@@ -197,9 +197,7 @@ class ThumbnailImage extends StatelessWidget {
       },
       child: Stack(
         children: [
-          AnimatedContainer(
+          Container(
-            duration: const Duration(milliseconds: 300),
-            curve: Curves.decelerate,
             decoration: BoxDecoration(
               border: multiselectEnabled && isSelected
                   ? Border.all(

mobile/lib/modules/home/ui/control_bottom_app_bar.dart

@@ -19,8 +19,6 @@ class ControlBottomAppBar extends ConsumerWidget {
   final void Function() onCreateNewAlbum;
   final void Function() onUpload;
   final void Function() onStack;
-  final void Function() onEditTime;
-  final void Function() onEditLocation;
 
   final List<Album> albums;
   final List<Album> sharedAlbums;
@@ -39,8 +37,6 @@ class ControlBottomAppBar extends ConsumerWidget {
     required this.onCreateNewAlbum,
     required this.onUpload,
     required this.onStack,
-    required this.onEditTime,
-    required this.onEditLocation,
     this.selectionAssetState = const SelectionAssetState(),
     this.enabled = true,
   }) : super(key: key);
@@ -78,18 +74,6 @@ class ControlBottomAppBar extends ConsumerWidget {
             label: "control_bottom_app_bar_favorite".tr(),
             onPressed: enabled ? onFavorite : null,
           ),
-        if (hasRemote)
-          ControlBoxButton(
-            iconData: Icons.edit_calendar_outlined,
-            label: "control_bottom_app_bar_edit_time".tr(),
-            onPressed: enabled ? onEditTime : null,
-          ),
-        if (hasRemote)
-          ControlBoxButton(
-            iconData: Icons.edit_location_alt_outlined,
-            label: "control_bottom_app_bar_edit_location".tr(),
-            onPressed: enabled ? onEditLocation : null,
-          ),
         ControlBoxButton(
           iconData: Icons.delete_outline_rounded,
           label: "control_bottom_app_bar_delete".tr(),

mobile/lib/modules/home/views/home_page.dart

@@ -28,7 +28,6 @@ import 'package:immich_mobile/shared/providers/websocket.provider.dart';
 import 'package:immich_mobile/shared/ui/immich_app_bar.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/immich_toast.dart';
-import 'package:immich_mobile/shared/views/immich_loading_overlay.dart';
 import 'package:immich_mobile/utils/selection_handlers.dart';
 
 class HomePage extends HookConsumerWidget {
@@ -51,7 +50,7 @@ class HomePage extends HookConsumerWidget {
 
     final tipOneOpacity = useState(0.0);
     final refreshCount = useState(0);
-    final processing = useProcessingOverlay();
+    final processing = useState(false);
 
     useEffect(
       () {
@@ -312,34 +311,6 @@ class HomePage extends HookConsumerWidget {
         }
       }
 
-      void onEditTime() async {
-        try {
-          final remoteAssets = ownedRemoteSelection(
-            localErrorMessage: 'home_page_favorite_err_local'.tr(),
-            ownerErrorMessage: 'home_page_favorite_err_partner'.tr(),
-          );
-          if (remoteAssets.isNotEmpty) {
-            handleEditDateTime(ref, context, remoteAssets.toList());
-          }
-        } finally {
-          selectionEnabledHook.value = false;
-        }
-      }
-
-      void onEditLocation() async {
-        try {
-          final remoteAssets = ownedRemoteSelection(
-            localErrorMessage: 'home_page_favorite_err_local'.tr(),
-            ownerErrorMessage: 'home_page_favorite_err_partner'.tr(),
-          );
-          if (remoteAssets.isNotEmpty) {
-            handleEditLocation(ref, context, remoteAssets.toList());
-          }
-        } finally {
-          selectionEnabledHook.value = false;
-        }
-      }
-
       Future<void> refreshAssets() async {
         final fullRefresh = refreshCount.value > 0;
         await ref.read(assetProvider.notifier).getAllAsset(clear: fullRefresh);
@@ -352,12 +323,16 @@ class HomePage extends HookConsumerWidget {
         } else {
           refreshCount.value++;
           // set counter back to 0 if user does not request refresh again
-          Timer(const Duration(seconds: 4), () => refreshCount.value = 0);
+          Timer(const Duration(seconds: 4), () {
+            refreshCount.value = 0;
+          });
         }
       }
 
       buildLoadingIndicator() {
-        Timer(const Duration(seconds: 2), () => tipOneOpacity.value = 1);
+        Timer(const Duration(seconds: 2), () {
+          tipOneOpacity.value = 1;
+        });
 
         return Center(
           child: Column(
@@ -439,9 +414,8 @@ class HomePage extends HookConsumerWidget {
                 enabled: !processing.value,
                 selectionAssetState: selectionAssetState.value,
                 onStack: onStack,
-                onEditTime: onEditTime,
-                onEditLocation: onEditLocation,
               ),
+            if (processing.value) const Center(child: ImmichLoadingIndicator()),
           ],
         ),
       );

mobile/lib/modules/login/providers/authentication.provider.dart

@@ -5,8 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_udid/flutter_udid.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/album/providers/album.provider.dart';
-import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/modules/login/models/authentication_state.model.dart';
 import 'package:immich_mobile/shared/models/user.dart';
@@ -23,7 +21,6 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
   AuthenticationNotifier(
     this._apiService,
     this._db,
-    this._ref,
   ) : super(
           AuthenticationState(
             deviceId: "",
@@ -39,8 +36,6 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
 
   final ApiService _apiService;
   final Isar _db;
-  final StateNotifierProviderRef<AuthenticationNotifier, AuthenticationState>
-      _ref;
   final _log = Logger("AuthenticationNotifier");
 
   Future<bool> login(
@@ -116,8 +111,6 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
         Store.delete(StoreKey.currentUser),
         Store.delete(StoreKey.accessToken),
       ]);
-      _ref.invalidate(albumProvider);
-      _ref.invalidate(sharedAlbumProvider);
 
       state = state.copyWith(
         deviceId: "",
@@ -229,6 +222,5 @@ final authenticationProvider =
   return AuthenticationNotifier(
     ref.watch(apiServiceProvider),
     ref.watch(dbProvider),
-    ref,
   );
 });

mobile/lib/modules/login/ui/login_form.dart

@@ -48,7 +48,7 @@ class LoginForm extends HookConsumerWidget {
     /// Fetch the server login credential and enables oAuth login if necessary
     /// Returns true if successful, false otherwise
     Future<bool> getServerLoginCredential() async {
-      final serverUrl = sanitizeUrl(serverEndpointController.text);
+      final serverUrl = serverEndpointController.text.trim();
 
       // Guard empty URL
       if (serverUrl.isEmpty) {
@@ -127,12 +127,6 @@ class LoginForm extends HookConsumerWidget {
     );
 
     populateTestLoginInfo() {
-      usernameController.text = 'demo@immich.app';
-      passwordController.text = 'demo';
-      serverEndpointController.text = 'https://demo.immich.app';
-    }
-
-    populateTestLoginInfo1() {
       usernameController.text = 'testuser@email.com';
       passwordController.text = 'password';
       serverEndpointController.text = 'http://10.1.15.216:2283/api';
@@ -150,7 +144,7 @@ class LoginForm extends HookConsumerWidget {
             await ref.read(authenticationProvider.notifier).login(
                   usernameController.text,
                   passwordController.text,
-                  sanitizeUrl(serverEndpointController.text),
+                  serverEndpointController.text.trim(),
                 );
         if (isAuthenticated) {
           // Resume backup (if enable) then navigate
@@ -187,7 +181,7 @@ class LoginForm extends HookConsumerWidget {
 
       try {
         oAuthServerConfig = await oAuthService
-            .getOAuthServerConfig(sanitizeUrl(serverEndpointController.text));
+            .getOAuthServerConfig(serverEndpointController.text);
 
         isLoading.value = true;
       } catch (e) {
@@ -209,7 +203,7 @@ class LoginForm extends HookConsumerWidget {
               .watch(authenticationProvider.notifier)
               .setSuccessLoginInfo(
                 accessToken: loginResponseDto.accessToken,
-                serverUrl: sanitizeUrl(serverEndpointController.text),
+                serverUrl: serverEndpointController.text,
               );
 
           if (isSuccess) {
@@ -305,7 +299,7 @@ class LoginForm extends HookConsumerWidget {
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
             Text(
-              sanitizeUrl(serverEndpointController.text),
+              serverEndpointController.text,
               style: context.textTheme.displaySmall,
               textAlign: TextAlign.center,
             ),
@@ -393,7 +387,6 @@ class LoginForm extends HookConsumerWidget {
                     children: [
                       GestureDetector(
                         onDoubleTap: () => populateTestLoginInfo(),
-                        onLongPress: () => populateTestLoginInfo1(),
                         child: RotationTransition(
                           turns: logoAnimationController,
                           child: const ImmichLogo(

mobile/lib/modules/map/ui/map_location_picker.dart

@@ -1,113 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:flutter_map/flutter_map.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/modules/map/providers/map_state.provider.dart';
-import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
-import 'package:immich_mobile/utils/immich_app_theme.dart';
-import 'package:latlong2/latlong.dart';
-
-class MapLocationPickerPage extends HookConsumerWidget {
-  final LatLng? initialLatLng;
-
-  const MapLocationPickerPage({super.key, this.initialLatLng});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final selectedLatLng = useState<LatLng>(initialLatLng ?? LatLng(0, 0));
-    final isDarkTheme =
-        ref.watch(mapStateNotifier.select((state) => state.isDarkTheme));
-    final isLoading =
-        ref.watch(mapStateNotifier.select((state) => state.isLoading));
-    final maxZoom = ref.read(mapStateNotifier.notifier).maxZoom;
-
-    return Theme(
-      // Override app theme based on map theme
-      data: isDarkTheme ? immichDarkTheme : immichLightTheme,
-      child: Scaffold(
-        extendBodyBehindAppBar: true,
-        body: Stack(
-          children: [
-            if (!isLoading)
-              FlutterMap(
-                options: MapOptions(
-                  maxBounds:
-                      LatLngBounds(LatLng(-90, -180.0), LatLng(90.0, 180.0)),
-                  interactiveFlags: InteractiveFlag.doubleTapZoom |
-                      InteractiveFlag.drag |
-                      InteractiveFlag.flingAnimation |
-                      InteractiveFlag.pinchMove |
-                      InteractiveFlag.pinchZoom,
-                  center: LatLng(20, 20),
-                  zoom: 2,
-                  minZoom: 1,
-                  maxZoom: maxZoom,
-                  onTap: (tapPosition, point) => selectedLatLng.value = point,
-                ),
-                children: [
-                  ref.read(mapStateNotifier.notifier).getTileLayer(),
-                  MarkerLayer(
-                    markers: [
-                      Marker(
-                        anchorPos: AnchorPos.align(AnchorAlign.top),
-                        point: selectedLatLng.value,
-                        builder: (ctx) => const Image(
-                          image: AssetImage('assets/location-pin.png'),
-                        ),
-                        height: 40,
-                        width: 40,
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            if (isLoading)
-              Positioned(
-                top: context.height * 0.35,
-                left: context.width * 0.425,
-                child: const ImmichLoadingIndicator(),
-              ),
-          ],
-        ),
-        bottomSheet: BottomSheet(
-          onClosing: () {},
-          builder: (context) => SizedBox(
-            height: 150,
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                Text(
-                  "${selectedLatLng.value.latitude.toStringAsFixed(4)}, ${selectedLatLng.value.longitude.toStringAsFixed(4)}",
-                  style: context.textTheme.bodyLarge?.copyWith(
-                    color: context.primaryColor,
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                  children: [
-                    ElevatedButton(
-                      onPressed: () => context.autoPop(selectedLatLng.value),
-                      child: const Text("map_location_picker_page_use_location")
-                          .tr(),
-                    ),
-                    ElevatedButton(
-                      onPressed: () => context.autoPop(),
-                      style: ElevatedButton.styleFrom(
-                        backgroundColor: context.colorScheme.error,
-                      ),
-                      child: const Text("action_common_cancel").tr(),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

mobile/lib/modules/map/ui/map_thumbnail.dart

@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_map/plugin_api.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/map/providers/map_state.provider.dart';
-import 'package:immich_mobile/modules/map/utils/map_controller_hook.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -14,15 +12,13 @@ class MapThumbnail extends HookConsumerWidget {
   final double zoom;
   final List<Marker> markers;
   final double height;
-  final double width;
   final bool showAttribution;
   final bool isDarkTheme;
 
   const MapThumbnail({
     super.key,
     required this.coords,
-    this.height = 100,
+    required this.height,
-    this.width = 100,
     this.onTap,
     this.zoom = 1,
     this.showAttribution = true,
@@ -32,33 +28,18 @@ class MapThumbnail extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final mapController = useMapController();
-    final isMapReady = useRef(false);
     ref.watch(mapStateNotifier.select((s) => s.mapStyle));
 
-    useEffect(
-      () {
-        if (isMapReady.value && mapController.center != coords) {
-          mapController.move(coords, zoom);
-        }
-        return null;
-      },
-      [coords],
-    );
-
     return SizedBox(
       height: height,
-      width: width,
       child: ClipRRect(
         borderRadius: const BorderRadius.all(Radius.circular(15)),
         child: FlutterMap(
-          mapController: mapController,
           options: MapOptions(
             interactiveFlags: InteractiveFlag.none,
             center: coords,
             zoom: zoom,
             onTap: onTap,
-            onMapReady: () => isMapReady.value = true,
           ),
           nonRotatedChildren: [
             if (showAttribution)

mobile/lib/modules/map/utils/map_controller_hook.dart

@@ -1,32 +0,0 @@
-import 'package:flutter/widgets.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:flutter_map/flutter_map.dart';
-
-MapController useMapController({
-  String? debugLabel,
-  List<Object?>? keys,
-}) {
-  return use(_MapControllerHook(keys: keys));
-}
-
-class _MapControllerHook extends Hook<MapController> {
-  const _MapControllerHook({List<Object?>? keys}) : super(keys: keys);
-
-  @override
-  HookState<MapController, Hook<MapController>> createState() =>
-      _MapControllerHookState();
-}
-
-class _MapControllerHookState
-    extends HookState<MapController, _MapControllerHook> {
-  late final controller = MapController();
-
-  @override
-  MapController build(BuildContext context) => controller;
-
-  @override
-  void dispose() => controller.dispose();
-
-  @override
-  String get debugLabel => 'useMapController';
-}

mobile/lib/modules/map/views/map_page.dart

@@ -55,7 +55,6 @@ class MapPageState extends ConsumerState<MapPage> {
   // in onMapEvent() since MapEventMove#id is not populated properly in the
   // current version of flutter_map(4.0.0) used
   bool forceAssetUpdate = false;
-  bool isMapReady = false;
   late final Debounce debounce;
 
   @override
@@ -80,7 +79,7 @@ class MapPageState extends ConsumerState<MapPage> {
     bool forceReload = false,
   }) {
     try {
-      final bounds = isMapReady ? mapController.bounds : null;
+      final bounds = mapController.bounds;
       if (bounds != null) {
         final oldAssetsInBounds = assetsInBounds.toSet();
         assetsInBounds =
@@ -456,7 +455,6 @@ class MapPageState extends ConsumerState<MapPage> {
                     minZoom: 1,
                     maxZoom: maxZoom,
                     onMapReady: () {
-                      isMapReady = true;
                       mapController.mapEventStream.listen(onMapEvent);
                     },
                   ),

mobile/lib/modules/memories/ui/memory_lane.dart

@@ -17,7 +17,7 @@ class MemoryLane extends HookConsumerWidget {
         .whenData(
           (memories) => memories != null
               ? Container(
-                  margin: const EdgeInsets.only(top: 10, left: 10),
+                  margin: const EdgeInsets.only(top: 10),
                   height: 200,
                   child: ListView.builder(
                     scrollDirection: Axis.horizontal,

mobile/lib/modules/partner/views/partner_detail_page.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/modules/partner/providers/partner.provider.dart';
 import 'package:immich_mobile/shared/models/user.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/immich_toast.dart';
 
 class PartnerDetailPage extends HookConsumerWidget {
@@ -71,8 +71,8 @@ class PartnerDetailPage extends HookConsumerWidget {
           ),
         ],
       ),
-      body: assets.widgetWhen(
+      body: assets.when(
-        onData: (renderList) => renderList.isEmpty
+        data: (renderList) => renderList.isEmpty
             ? Padding(
                 padding: const EdgeInsets.all(16),
                 child: Text(
@@ -84,6 +84,8 @@ class PartnerDetailPage extends HookConsumerWidget {
                 onRefresh: () =>
                     ref.read(assetProvider.notifier).getPartnerAssets(partner),
               ),
+        error: (e, _) => Text("Error loading partners:\n$e"),
+        loading: () => const Center(child: ImmichLoadingIndicator()),
       ),
     );
   }

mobile/lib/modules/partner/views/partner_page.dart

@@ -1,7 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/partner/providers/partner.provider.dart';
 import 'package:immich_mobile/modules/partner/services/partner.service.dart';
 import 'package:immich_mobile/shared/models/user.dart';
@@ -35,7 +34,7 @@ class PartnerPage extends HookConsumerWidget {
             children: [
               for (User u in users)
                 SimpleDialogOption(
-                  onPressed: () => context.pop(u),
+                  onPressed: () => Navigator.pop(context, u),
                   child: Row(
                     children: [
                       Padding(
@@ -71,7 +70,8 @@ class PartnerPage extends HookConsumerWidget {
         builder: (BuildContext context) {
           return ConfirmDialog(
             title: "partner_page_stop_sharing_title",
-            content: "partner_page_stop_sharing_content".tr(args: [u.name]),
+            content:
+                "partner_page_stop_sharing_content".tr(args: [u.name]),
             onOk: () => ref.read(partnerServiceProvider).removePartner(u),
           );
         },
@@ -118,7 +118,6 @@ class PartnerPage extends HookConsumerWidget {
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16.0),
               child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Padding(
                     padding: const EdgeInsets.symmetric(vertical: 8),
@@ -127,15 +126,12 @@ class PartnerPage extends HookConsumerWidget {
                       style: TextStyle(fontSize: 14),
                     ).tr(),
                   ),
-                  Align(
+                  ElevatedButton.icon(
-                    alignment: Alignment.center,
+                    onPressed: availableUsers.whenOrNull(
-                    child: ElevatedButton.icon(
+                      data: (data) => addNewUsersHandler,
-                      onPressed: availableUsers.whenOrNull(
-                        data: (data) => addNewUsersHandler,
-                      ),
-                      icon: const Icon(Icons.person_add),
-                      label: const Text("partner_page_add_partner").tr(),
                     ),
+                    icon: const Icon(Icons.person_add),
+                    label: const Text("partner_page_add_partner").tr(),
                   ),
                 ],
               ),

mobile/lib/modules/search/services/person.service.g.dart

@@ -6,7 +6,7 @@ part of 'person.service.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$personServiceHash() => r'cde0a9c029d16ddde2adcd58ae8c863bf8cc1fed';
+String _$personServiceHash() => r'3fc3dcf4603c7b55c0deae65f39f6c212eea492b';
 
 /// See also [personService].
 @ProviderFor(personService)

mobile/lib/modules/search/ui/curated_places_row.dart

@@ -29,8 +29,9 @@ class CuratedPlacesRow extends CuratedRow {
         onTap: () => context.autoPush(
           const MapRoute(),
         ),
-        child: SizedBox.square(
+        child: SizedBox(
-          dimension: imageSize,
+          height: imageSize,
+          width: imageSize,
           child: Stack(
             children: [
               Padding(
@@ -42,7 +43,6 @@ class CuratedPlacesRow extends CuratedRow {
                     5,
                   ),
                   height: imageSize,
-                  width: imageSize,
                   showAttribution: false,
                   isDarkTheme: context.isDarkTheme,
                 ),

mobile/lib/modules/search/views/all_motion_videos_page.dart

@@ -1,10 +1,10 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/modules/search/providers/all_motion_photos.provider.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 
 class AllMotionPhotosPage extends HookConsumerWidget {
   const AllMotionPhotosPage({super.key});
@@ -21,10 +21,14 @@ class AllMotionPhotosPage extends HookConsumerWidget {
           icon: const Icon(Icons.arrow_back_ios_rounded),
         ),
       ),
-      body: motionPhotos.widgetWhen(
+      body: motionPhotos.when(
-        onData: (assets) => ImmichAssetGrid(
+        data: (assets) => ImmichAssetGrid(
           assets: assets,
         ),
+        error: (e, s) => Text(e.toString()),
+        loading: () => const Center(
+          child: ImmichLoadingIndicator(),
+        ),
       ),
     );
   }

mobile/lib/modules/search/views/all_people_page.dart

@@ -1,10 +1,10 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/search/providers/people.provider.dart';
 import 'package:immich_mobile/modules/search/ui/explore_grid.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 
 class AllPeoplePage extends HookConsumerWidget {
   const AllPeoplePage({super.key});
@@ -23,8 +23,12 @@ class AllPeoplePage extends HookConsumerWidget {
           icon: const Icon(Icons.arrow_back_ios_rounded),
         ),
       ),
-      body: curatedPeople.widgetWhen(
+      body: curatedPeople.when(
-        onData: (people) => ExploreGrid(
+        loading: () => const Center(child: ImmichLoadingIndicator()),
+        error: (err, stack) => Center(
+          child: Text('Error: $err'),
+        ),
+        data: (people) => ExploreGrid(
           isPeople: true,
           curatedContent: people,
         ),

mobile/lib/modules/search/views/all_videos_page.dart

@@ -1,10 +1,10 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/modules/search/providers/all_video_assets.provider.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 
 class AllVideosPage extends HookConsumerWidget {
   const AllVideosPage({super.key});
@@ -21,10 +21,14 @@ class AllVideosPage extends HookConsumerWidget {
           icon: const Icon(Icons.arrow_back_ios_rounded),
         ),
       ),
-      body: videos.widgetWhen(
+      body: videos.when(
-        onData: (assets) => ImmichAssetGrid(
+        data: (assets) => ImmichAssetGrid(
           assets: assets,
         ),
+        error: (e, s) => Text(e.toString()),
+        loading: () => const Center(
+          child: ImmichLoadingIndicator(),
+        ),
       ),
     );
   }

mobile/lib/modules/search/views/curated_location_page.dart

@@ -1,11 +1,11 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/search/models/curated_content.dart';
 import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';
 import 'package:immich_mobile/modules/search/ui/explore_grid.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:openapi/api.dart';
 
 class CuratedLocationPage extends HookConsumerWidget {
@@ -26,8 +26,12 @@ class CuratedLocationPage extends HookConsumerWidget {
           icon: const Icon(Icons.arrow_back_ios_rounded),
         ),
       ),
-      body: curatedLocation.widgetWhen(
+      body: curatedLocation.when(
-        onData: (curatedLocations) => ExploreGrid(
+        loading: () => const Center(child: ImmichLoadingIndicator()),
+        error: (err, stack) => Center(
+          child: Text('Error: $err'),
+        ),
+        data: (curatedLocations) => ExploreGrid(
           curatedContent: curatedLocations
               .map(
                 (l) => CuratedContent(

mobile/lib/modules/search/views/person_result_page.dart

@@ -8,6 +8,7 @@ import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart'
 import 'package:immich_mobile/modules/search/providers/people.provider.dart';
 import 'package:immich_mobile/modules/search/ui/person_name_edit_form.dart';
 import 'package:immich_mobile/shared/models/store.dart' as isar_store;
+import 'package:immich_mobile/shared/ui/scaffold_error_body.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 
 class PersonResultPage extends HookConsumerWidget {
@@ -111,7 +112,7 @@ class PersonResultPage extends HookConsumerWidget {
           ),
         ],
       ),
-      body: ref.watch(personAssetsProvider(personId)).widgetWhen(
+      body: ref.watch(personAssetsProvider(personId)).scaffoldBodyWhen(
             onData: (renderList) => ImmichAssetGrid(
               renderList: renderList,
               topWidget: Padding(
@@ -136,6 +137,7 @@ class PersonResultPage extends HookConsumerWidget {
                 ),
               ),
             ),
+            onError: const ScaffoldErrorBody(icon: Icons.person_off_outlined),
           ),
     );
   }

mobile/lib/modules/search/views/recently_added_page.dart

@@ -1,10 +1,10 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/modules/search/providers/recently_added.provider.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 
 class RecentlyAddedPage extends HookConsumerWidget {
   const RecentlyAddedPage({super.key});
@@ -21,10 +21,14 @@ class RecentlyAddedPage extends HookConsumerWidget {
           icon: const Icon(Icons.arrow_back_ios_rounded),
         ),
       ),
-      body: recents.widgetWhen(
+      body: recents.when(
-        onData: (searchResponse) => ImmichAssetGrid(
+        data: (searchResponse) => ImmichAssetGrid(
           assets: searchResponse,
         ),
+        error: (e, s) => Text(e.toString()),
+        loading: () => const Center(
+          child: ImmichLoadingIndicator(),
+        ),
       ),
     );
   }

mobile/lib/modules/search/views/search_page.dart

@@ -3,7 +3,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/search/models/curated_content.dart';
 import 'package:immich_mobile/modules/search/providers/people.provider.dart';
@@ -16,7 +15,7 @@ import 'package:immich_mobile/modules/search/ui/search_row_title.dart';
 import 'package:immich_mobile/modules/search/ui/search_suggestion_list.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/providers/server_info.provider.dart';
-import 'package:immich_mobile/shared/ui/scaffold_error_body.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 
 // ignore: must_be_immutable
 class SearchPage extends HookConsumerWidget {
@@ -74,9 +73,10 @@ class SearchPage extends HookConsumerWidget {
     buildPeople() {
       return SizedBox(
         height: imageSize,
-        child: curatedPeople.widgetWhen(
+        child: curatedPeople.when(
-          onError: (error, stack) => const ScaffoldErrorBody(withIcon: false),
+          loading: () => const Center(child: ImmichLoadingIndicator()),
-          onData: (people) => CuratedPeopleRow(
+          error: (err, stack) => Center(child: Text('Error: $err')),
+          data: (people) => CuratedPeopleRow(
             content: people.take(12).toList(),
             onTap: (content, index) {
               context.autoPush(
@@ -97,9 +97,10 @@ class SearchPage extends HookConsumerWidget {
     buildPlaces() {
       return SizedBox(
         height: imageSize,
-        child: curatedLocation.widgetWhen(
+        child: curatedLocation.when(
-          onError: (error, stack) => const ScaffoldErrorBody(withIcon: false),
+          loading: () => const Center(child: ImmichLoadingIndicator()),
-          onData: (locations) => CuratedPlacesRow(
+          error: (err, stack) => Center(child: Text('Error: $err')),
+          data: (locations) => CuratedPlacesRow(
             isMapEnabled: isMapEnabled,
             content: locations
                 .map(

mobile/lib/modules/settings/providers/app_settings.provider.g.dart

@@ -7,7 +7,7 @@ part of 'app_settings.provider.dart';
 // **************************************************************************
 
 String _$appSettingsServiceHash() =>
-    r'45ea609a91d250290431a7a08a14d16b37c7515d';
+    r'957a65af6967701112f3076b507f9738fec4b7be';
 
 /// See also [appSettingsService].
 @ProviderFor(appSettingsService)

mobile/lib/modules/settings/views/settings_page.dart

@@ -1,7 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/settings/ui/advanced_settings/advanced_settings.dart';
 import 'package:immich_mobile/modules/settings/ui/asset_list_settings/asset_list_settings.dart';
 import 'package:immich_mobile/modules/settings/ui/local_storage_settings/local_storage_settings.dart';
@@ -19,7 +18,9 @@ class SettingsPage extends HookConsumerWidget {
         leading: IconButton(
           iconSize: 20,
           splashRadius: 24,
-          onPressed: () => context.pop(),
+          onPressed: () {
+            Navigator.pop(context);
+          },
           icon: const Icon(Icons.arrow_back_ios_new_rounded),
         ),
         automaticallyImplyLeading: false,

mobile/lib/modules/shared_link/ui/shared_link_item.dart

@@ -46,11 +46,9 @@ class SharedLinkItem extends ConsumerWidget {
       } else if (difference.inHours > 0) {
         expiresText = "shared_link_expires_hours".plural(difference.inHours);
       } else if (difference.inMinutes > 0) {
-        expiresText =
+        expiresText = "shared_link_expires_minutes".plural(difference.inMinutes);
-            "shared_link_expires_minutes".plural(difference.inMinutes);
       } else if (difference.inSeconds > 0) {
-        expiresText =
+        expiresText = "shared_link_expires_seconds".plural(difference.inSeconds);
-            "shared_link_expires_seconds".plural(difference.inSeconds);
       }
     }
     return Text(
@@ -87,12 +85,7 @@ class SharedLinkItem extends ConsumerWidget {
       ).then((_) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text(
+            content: const Text("shared_link_clipboard_copied_massage").tr(),
-              "shared_link_clipboard_copied_massage",
-              style: context.textTheme.bodyLarge?.copyWith(
-                color: context.primaryColor,
-              ),
-            ).tr(),
             duration: const Duration(seconds: 2),
           ),
         );
@@ -169,12 +162,9 @@ class SharedLinkItem extends ConsumerWidget {
     Widget buildBottomInfo() {
       return Row(
         children: [
-          if (sharedLink.allowUpload)
+          if (sharedLink.allowUpload) buildInfoChip("shared_link_info_chip_upload".tr()),
-            buildInfoChip("shared_link_info_chip_upload".tr()),
+          if (sharedLink.allowDownload) buildInfoChip("shared_link_info_chip_download".tr()),
-          if (sharedLink.allowDownload)
+          if (sharedLink.showMetadata) buildInfoChip("shared_link_info_chip_metadata".tr()),
-            buildInfoChip("shared_link_info_chip_download".tr()),
-          if (sharedLink.showMetadata)
-            buildInfoChip("shared_link_info_chip_metadata".tr()),
         ],
       );
     }

mobile/lib/modules/shared_link/views/shared_link_edit_page.dart

@@ -275,12 +275,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
       ).then((_) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text(
+            content: const Text("shared_link_clipboard_copied_massage").tr(),
-              "shared_link_clipboard_copied_massage",
-              style: context.textTheme.bodyLarge?.copyWith(
-                color: context.primaryColor,
-              ),
-            ).tr(),
             duration: const Duration(seconds: 2),
           ),
         );

mobile/lib/modules/shared_link/views/shared_link_page.dart

@@ -2,11 +2,11 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/shared_link/models/shared_link.dart';
 import 'package:immich_mobile/modules/shared_link/providers/shared_link.provider.dart';
 import 'package:immich_mobile/modules/shared_link/ui/shared_link_item.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 
 class SharedLinkPage extends HookConsumerWidget {
   const SharedLinkPage({Key? key}) : super(key: key);
@@ -18,10 +18,7 @@ class SharedLinkPage extends HookConsumerWidget {
     useEffect(
       () {
         ref.read(sharedLinksStateProvider.notifier).fetchLinks();
-        return () {
+        return () => ref.invalidate(sharedLinksStateProvider);
-          if (!context.mounted) return;
-          ref.invalidate(sharedLinksStateProvider);
-        };
       },
       [],
     );
@@ -116,10 +113,11 @@ class SharedLinkPage extends HookConsumerWidget {
         centerTitle: false,
       ),
       body: SafeArea(
-        child: sharedLinks.widgetWhen(
+        child: sharedLinks.when(
-          onError: (error, stackTrace) => buildNoShares(),
+          data: (links) =>
-          onData: (links) =>
               links.isNotEmpty ? buildSharesList(links) : buildNoShares(),
+          error: (error, stackTrace) => buildNoShares(),
+          loading: () => const Center(child: ImmichLoadingIndicator()),
         ),
       ),
     );

mobile/lib/modules/trash/views/trash_page.dart

@@ -3,7 +3,6 @@ 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/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/modules/home/ui/delete_dialog.dart';
@@ -12,8 +11,8 @@ import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
 import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 import 'package:immich_mobile/shared/ui/confirm_dialog.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/immich_toast.dart';
-import 'package:immich_mobile/shared/views/immich_loading_overlay.dart';
 
 class TrashPage extends HookConsumerWidget {
   const TrashPage({super.key});
@@ -25,7 +24,7 @@ class TrashPage extends HookConsumerWidget {
         ref.watch(serverInfoProvider.select((v) => v.serverConfig.trashDays));
     final selectionEnabledHook = useState(false);
     final selection = useState(<Asset>{});
-    final processing = useProcessingOverlay();
+    final processing = useState(false);
 
     void selectionListener(
       bool multiselect,
@@ -230,13 +229,18 @@ class TrashPage extends HookConsumerWidget {
       );
     }
 
-    return Scaffold(
+    return trashedAssets.when(
-      appBar: trashedAssets.maybeWhen(
+      loading: () => Scaffold(
-        orElse: () => buildAppBar("?"),
+        appBar: buildAppBar("?"),
-        data: (data) => buildAppBar(data.totalAssets.toString()),
+        body: const Center(child: CircularProgressIndicator()),
       ),
-      body: trashedAssets.widgetWhen(
+      error: (error, stackTrace) => Scaffold(
-        onData: (data) => data.isEmpty
+        appBar: buildAppBar("!"),
+        body: Center(child: Text(error.toString())),
+      ),
+      data: (data) => Scaffold(
+        appBar: buildAppBar(data.totalAssets.toString()),
+        body: data.isEmpty
             ? Center(
                 child: Text('trash_page_no_assets'.tr()),
               )
@@ -250,9 +254,11 @@ class TrashPage extends HookConsumerWidget {
                       showMultiSelectIndicator: false,
                       showStack: true,
                       topWidget: Padding(
-                        padding: const EdgeInsets.symmetric(
+                        padding: const EdgeInsets.only(
-                          horizontal: 12,
+                          top: 24,
-                          vertical: 24,
+                          bottom: 24,
+                          left: 12,
+                          right: 12,
                         ),
                         child: const Text(
                           "trash_page_info",
@@ -261,6 +267,8 @@ class TrashPage extends HookConsumerWidget {
                     ),
                   ),
                   if (selectionEnabledHook.value) buildBottomBar(),
+                  if (processing.value)
+                    const Center(child: ImmichLoadingIndicator()),
                 ],
               ),
       ),

mobile/lib/routing/custom_transition_builders.dart

@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CustomTransitionsBuilders {
-  const CustomTransitionsBuilders._();
-
-  static const ZoomPageTransitionsBuilder zoomPageTransitionsBuilder =
-      ZoomPageTransitionsBuilder();
-
-  static const RouteTransitionsBuilder zoomedPage = _zoomedPage;
-
-  static Widget _zoomedPage(
-    BuildContext context,
-    Animation<double> animation,
-    Animation<double> secondaryAnimation,
-    Widget child,
-  ) {
-    return zoomPageTransitionsBuilder.buildTransitions(
-      // Empty PageRoute<> object, only used to pass allowSnapshotting to ZoomPageTransitionsBuilder
-      PageRouteBuilder(
-        allowSnapshotting: true,
-        fullscreenDialog: false,
-        pageBuilder: (context, animation, secondaryAnimation) =>
-            const SizedBox.shrink(),
-      ),
-      context,
-      animation,
-      secondaryAnimation,
-      child,
-    );
-  }
-}

mobile/lib/routing/router.dart

@@ -8,7 +8,6 @@ import 'package:immich_mobile/modules/album/views/album_viewer_page.dart';
 import 'package:immich_mobile/modules/album/views/asset_selection_page.dart';
 import 'package:immich_mobile/modules/album/views/create_album_page.dart';
 import 'package:immich_mobile/modules/album/views/library_page.dart';
-import 'package:immich_mobile/modules/map/ui/map_location_picker.dart';
 import 'package:immich_mobile/modules/map/views/map_page.dart';
 import 'package:immich_mobile/modules/memories/models/memory.dart';
 import 'package:immich_mobile/modules/memories/views/memory_page.dart';
@@ -44,7 +43,6 @@ import 'package:immich_mobile/modules/search/views/search_page.dart';
 import 'package:immich_mobile/modules/search/views/search_result_page.dart';
 import 'package:immich_mobile/modules/settings/views/settings_page.dart';
 import 'package:immich_mobile/routing/auth_guard.dart';
-import 'package:immich_mobile/routing/custom_transition_builders.dart';
 import 'package:immich_mobile/routing/duplicate_guard.dart';
 import 'package:immich_mobile/routing/backup_permission_guard.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
@@ -58,8 +56,7 @@ import 'package:immich_mobile/shared/views/app_log_page.dart';
 import 'package:immich_mobile/shared/views/splash_screen.dart';
 import 'package:immich_mobile/shared/views/tab_controller_page.dart';
 import 'package:isar/isar.dart';
-import 'package:photo_manager/photo_manager.dart' hide LatLng;
+import 'package:photo_manager/photo_manager.dart';
-import 'package:latlong2/latlong.dart';
 
 part 'router.gr.dart';
 
@@ -89,10 +86,9 @@ part 'router.gr.dart';
       ],
       transitionsBuilder: TransitionsBuilders.fadeIn,
     ),
-    CustomRoute(
+    AutoRoute(
       page: GalleryViewerPage,
       guards: [AuthGuard, DuplicateGuard],
-      transitionsBuilder: CustomTransitionsBuilders.zoomedPage,
     ),
     AutoRoute(page: VideoViewerPage, guards: [AuthGuard, DuplicateGuard]),
     AutoRoute(
@@ -174,10 +170,6 @@ part 'router.gr.dart';
       transitionsBuilder: TransitionsBuilders.slideLeft,
       durationInMilliseconds: 200,
     ),
-    CustomRoute<LatLng?>(
-      page: MapLocationPickerPage,
-      guards: [AuthGuard, DuplicateGuard],
-    ),
   ],
 )
 class AppRouter extends _$AppRouter {

mobile/lib/routing/router.gr.dart

@@ -63,7 +63,7 @@ class _$AppRouter extends RootStackRouter {
     },
     GalleryViewerRoute.name: (routeData) {
       final args = routeData.argsAs<GalleryViewerRouteArgs>();
-      return CustomPage<dynamic>(
+      return MaterialPageX<dynamic>(
         routeData: routeData,
         child: GalleryViewerPage(
           key: args.key,
@@ -75,9 +75,6 @@ class _$AppRouter extends RootStackRouter {
           isOwner: args.isOwner,
           sharedAlbumId: args.sharedAlbumId,
         ),
-        transitionsBuilder: CustomTransitionsBuilders.zoomedPage,
-        opaque: true,
-        barrierDismissible: false,
       );
     },
     VideoViewerRoute.name: (routeData) {
@@ -360,19 +357,6 @@ class _$AppRouter extends RootStackRouter {
         barrierDismissible: false,
       );
     },
-    MapLocationPickerRoute.name: (routeData) {
-      final args = routeData.argsAs<MapLocationPickerRouteArgs>(
-          orElse: () => const MapLocationPickerRouteArgs());
-      return CustomPage<LatLng?>(
-        routeData: routeData,
-        child: MapLocationPickerPage(
-          key: args.key,
-          initialLatLng: args.initialLatLng,
-        ),
-        opaque: true,
-        barrierDismissible: false,
-      );
-    },
     HomeRoute.name: (routeData) {
       return MaterialPageX<dynamic>(
         routeData: routeData,
@@ -717,14 +701,6 @@ class _$AppRouter extends RootStackRouter {
             duplicateGuard,
           ],
         ),
-        RouteConfig(
-          MapLocationPickerRoute.name,
-          path: '/map-location-picker-page',
-          guards: [
-            authGuard,
-            duplicateGuard,
-          ],
-        ),
       ];
 }
 
@@ -1642,40 +1618,6 @@ class ActivitiesRouteArgs {
   }
 }
 
-/// generated route for
-/// [MapLocationPickerPage]
-class MapLocationPickerRoute extends PageRouteInfo<MapLocationPickerRouteArgs> {
-  MapLocationPickerRoute({
-    Key? key,
-    LatLng? initialLatLng,
-  }) : super(
-          MapLocationPickerRoute.name,
-          path: '/map-location-picker-page',
-          args: MapLocationPickerRouteArgs(
-            key: key,
-            initialLatLng: initialLatLng,
-          ),
-        );
-
-  static const String name = 'MapLocationPickerRoute';
-}
-
-class MapLocationPickerRouteArgs {
-  const MapLocationPickerRouteArgs({
-    this.key,
-    this.initialLatLng,
-  });
-
-  final Key? key;
-
-  final LatLng? initialLatLng;
-
-  @override
-  String toString() {
-    return 'MapLocationPickerRouteArgs{key: $key, initialLatLng: $initialLatLng}';
-  }
-}
-
 /// generated route for
 /// [HomePage]
 class HomeRoute extends PageRouteInfo<void> {

mobile/lib/shared/models/asset.dart

@@ -256,8 +256,6 @@ class Asset {
         isFavorite != a.isFavorite ||
         isArchived != a.isArchived ||
         isTrashed != a.isTrashed ||
-        a.exifInfo?.latitude != exifInfo?.latitude ||
-        a.exifInfo?.longitude != exifInfo?.longitude ||
         // no local stack count or different count from remote
         ((stackCount == null && a.stackCount != null) ||
             (stackCount != null &&

mobile/lib/shared/providers/api.provider.g.dart

@@ -6,7 +6,7 @@ part of 'api.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$apiServiceHash() => r'5b8beddb448316bdae5e3963ff77601653715729';
+String _$apiServiceHash() => r'03cbd33147a7058d56175e532ac47e1aa4858c6d';
 
 /// See also [apiService].
 @ProviderFor(apiService)

mobile/lib/shared/providers/websocket.provider.dart

@@ -1,13 +1,10 @@
-import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/server_info/server_version.model.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
-import 'package:immich_mobile/shared/providers/db.provider.dart';
 import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 import 'package:immich_mobile/shared/services/sync.service.dart';
 import 'package:immich_mobile/utils/debounce.dart';
@@ -17,33 +14,13 @@ import 'package:socket_io_client/socket_io_client.dart';
 
 enum PendingAction {
   assetDelete,
-  assetUploaded,
-  assetHidden,
 }
 
 class PendingChange {
-  final String id;
   final PendingAction action;
   final dynamic value;
 
-  const PendingChange(
+  const PendingChange(this.action, this.value);
-    this.id,
-    this.action,
-    this.value,
-  );
-
-  @override
-  String toString() => 'PendingChange(id: $id, action: $action, value: $value)';
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is PendingChange && other.id == id && other.action == action;
-  }
-
-  @override
-  int get hashCode => id.hashCode ^ action.hashCode;
 }
 
 class WebsocketState {
@@ -154,7 +131,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
         socket.on('on_asset_trash', _handleServerUpdates);
         socket.on('on_asset_restore', _handleServerUpdates);
         socket.on('on_asset_update', _handleServerUpdates);
-        socket.on('on_asset_hidden', _handleOnAssetHidden);
         socket.on('on_new_release', _handleReleaseUpdates);
       } catch (e) {
         debugPrint("[WEBSOCKET] Catch Websocket Error - ${e.toString()}");
@@ -187,78 +163,35 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
   }
 
   void addPendingChange(PendingAction action, dynamic value) {
-    final now = DateTime.now();
     state = state.copyWith(
-      pendingChanges: [
+      pendingChanges: [...state.pendingChanges, PendingChange(action, value)],
-        ...state.pendingChanges,
-        PendingChange(now.millisecondsSinceEpoch.toString(), action, value),
-      ],
     );
-    _debounce(handlePendingChanges);
   }
 
-  Future<void> _handlePendingDeletes() async {
+  void handlePendingChanges() {
     final deleteChanges = state.pendingChanges
         .where((c) => c.action == PendingAction.assetDelete)
         .toList();
     if (deleteChanges.isNotEmpty) {
       List<String> remoteIds =
           deleteChanges.map((a) => a.value.toString()).toList();
-      await _ref.read(syncServiceProvider).handleRemoteAssetRemoval(remoteIds);
+      _ref.read(syncServiceProvider).handleRemoteAssetRemoval(remoteIds);
       state = state.copyWith(
         pendingChanges: state.pendingChanges
-            .whereNot((c) => deleteChanges.contains(c))
+            .where((c) => c.action != PendingAction.assetDelete)
             .toList(),
       );
     }
   }
 
-  Future<void> _handlePendingUploaded() async {
+  void _handleOnUploadSuccess(dynamic data) {
-    final uploadedChanges = state.pendingChanges
+    final dto = AssetResponseDto.fromJson(data);
-        .where((c) => c.action == PendingAction.assetUploaded)
+    if (dto != null) {
-        .toList();
+      final newAsset = Asset.remote(dto);
-    if (uploadedChanges.isNotEmpty) {
+      _ref.watch(assetProvider.notifier).onNewAssetUploaded(newAsset);
-      List<AssetResponseDto?> remoteAssets = uploadedChanges
-          .map((a) => AssetResponseDto.fromJson(a.value))
-          .toList();
-      for (final dto in remoteAssets) {
-        if (dto != null) {
-          final newAsset = Asset.remote(dto);
-          await _ref.watch(assetProvider.notifier).onNewAssetUploaded(newAsset);
-        }
-      }
-      state = state.copyWith(
-        pendingChanges: state.pendingChanges
-            .whereNot((c) => uploadedChanges.contains(c))
-            .toList(),
-      );
     }
   }
 
-  Future<void> _handlingPendingHidden() async {
-    final hiddenChanges = state.pendingChanges
-        .where((c) => c.action == PendingAction.assetHidden)
-        .toList();
-    if (hiddenChanges.isNotEmpty) {
-      List<String> remoteIds =
-          hiddenChanges.map((a) => a.value.toString()).toList();
-      final db = _ref.watch(dbProvider);
-      await db.writeTxn(() => db.assets.deleteAllByRemoteId(remoteIds));
-
-      state = state.copyWith(
-        pendingChanges: state.pendingChanges
-            .whereNot((c) => hiddenChanges.contains(c))
-            .toList(),
-      );
-    }
-  }
-
-  void handlePendingChanges() async {
-    await _handlePendingUploaded();
-    await _handlePendingDeletes();
-    await _handlingPendingHidden();
-  }
-
   void _handleOnConfigUpdate(dynamic _) {
     _ref.read(serverInfoProvider.notifier).getServerFeatures();
     _ref.read(serverInfoProvider.notifier).getServerConfig();
@@ -269,14 +202,10 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     _ref.read(assetProvider.notifier).getAllAsset();
   }
 
-  void _handleOnUploadSuccess(dynamic data) =>
+  void _handleOnAssetDelete(dynamic data) {
-      addPendingChange(PendingAction.assetUploaded, data);
+    addPendingChange(PendingAction.assetDelete, data);
-
+    _debounce(handlePendingChanges);
-  void _handleOnAssetDelete(dynamic data) =>
+  }
-      addPendingChange(PendingAction.assetDelete, data);
-
-  void _handleOnAssetHidden(dynamic data) =>
-      addPendingChange(PendingAction.assetHidden, data);
 
   _handleReleaseUpdates(dynamic data) {
     // Json guard

mobile/lib/shared/services/asset.service.dart

@@ -11,7 +11,6 @@ import 'package:immich_mobile/shared/providers/db.provider.dart';
 import 'package:immich_mobile/shared/services/api.service.dart';
 import 'package:immich_mobile/shared/services/sync.service.dart';
 import 'package:isar/isar.dart';
-import 'package:latlong2/latlong.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
@@ -182,27 +181,4 @@ class AssetService {
   Future<List<Asset?>> changeArchiveStatus(List<Asset> assets, bool isArchive) {
     return updateAssets(assets, UpdateAssetDto(isArchived: isArchive));
   }
-
-  Future<List<Asset?>> changeDateTime(
-    List<Asset> assets,
-    String updatedDt,
-  ) {
-    return updateAssets(
-      assets,
-      UpdateAssetDto(dateTimeOriginal: updatedDt),
-    );
-  }
-
-  Future<List<Asset?>> changeLocation(
-    List<Asset> assets,
-    LatLng location,
-  ) {
-    return updateAssets(
-      assets,
-      UpdateAssetDto(
-        latitude: location.latitude,
-        longitude: location.longitude,
-      ),
-    );
-  }
 }

mobile/lib/shared/services/sync.service.dart

@@ -401,10 +401,6 @@ class SyncService {
 
       final Album a = await Album.remote(dto);
       await _db.writeTxn(() => _db.albums.store(a));
-    } else {
-      _log.warning(
-          "Failed to add album from server: assetCount ${dto.assetCount} != "
-          "asset array length ${dto.assets.length} for album ${dto.albumName}");
     }
   }
 

mobile/lib/shared/ui/date_time_picker.dart

@@ -1,260 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/duration_extensions.dart';
-import 'package:timezone/timezone.dart' as tz;
-import 'package:timezone/timezone.dart';
-
-Future<String?> showDateTimePicker({
-  required BuildContext context,
-  DateTime? initialDateTime,
-  String? initialTZ,
-  Duration? initialTZOffset,
-}) {
-  return showDialog<String?>(
-    context: context,
-    builder: (context) => _DateTimePicker(
-      initialDateTime: initialDateTime,
-      initialTZ: initialTZ,
-      initialTZOffset: initialTZOffset,
-    ),
-  );
-}
-
-String _getFormattedOffset(int offsetInMilli, tz.Location location) {
-  return "${location.name} (UTC${Duration(milliseconds: offsetInMilli).formatAsOffset()})";
-}
-
-class _DateTimePicker extends HookWidget {
-  final DateTime? initialDateTime;
-  final String? initialTZ;
-  final Duration? initialTZOffset;
-
-  const _DateTimePicker({
-    this.initialDateTime,
-    this.initialTZ,
-    this.initialTZOffset,
-  });
-
-  _TimeZoneOffset _getInitiationLocation() {
-    if (initialTZ != null) {
-      try {
-        return _TimeZoneOffset.fromLocation(
-          tz.timeZoneDatabase.get(initialTZ!),
-        );
-      } on LocationNotFoundException {
-        // no-op
-      }
-    }
-
-    Duration? tzOffset = initialTZOffset ?? initialDateTime?.timeZoneOffset;
-
-    if (tzOffset != null) {
-      final offsetInMilli = tzOffset.inMilliseconds;
-      // get all locations with matching offset
-      final locations = tz.timeZoneDatabase.locations.values.where(
-        (location) => location.currentTimeZone.offset == offsetInMilli,
-      );
-      // Prefer locations with abbreviation first
-      final location = locations.firstWhereOrNull(
-            (e) => !e.currentTimeZone.abbreviation.contains("0"),
-          ) ??
-          locations.firstOrNull;
-      if (location != null) {
-        return _TimeZoneOffset.fromLocation(location);
-      }
-    }
-
-    return _TimeZoneOffset.fromLocation(tz.getLocation("UTC"));
-  }
-
-  // returns a list of location<name> along with it's offset in duration
-  List<_TimeZoneOffset> getAllTimeZones() {
-    return tz.timeZoneDatabase.locations.values
-        .where((l) => !l.currentTimeZone.abbreviation.contains("0"))
-        .map(_TimeZoneOffset.fromLocation)
-        .sorted()
-        .toList();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final date = useState<DateTime>(initialDateTime ?? DateTime.now());
-    final tzOffset = useState<_TimeZoneOffset>(_getInitiationLocation());
-    final timeZones = useMemoized(() => getAllTimeZones(), const []);
-
-    void pickDate() async {
-      final now = DateTime.now();
-      // Handles cases where the date from the asset is far off in the future
-      final initialDate = date.value.isAfter(now) ? now : date.value;
-      final newDate = await showDatePicker(
-        context: context,
-        initialDate: initialDate,
-        firstDate: DateTime(1800),
-        lastDate: now,
-      );
-      if (newDate == null) {
-        return;
-      }
-
-      final newTime = await showTimePicker(
-        context: context,
-        initialTime: TimeOfDay.fromDateTime(date.value),
-      );
-
-      if (newTime == null) {
-        return;
-      }
-
-      date.value = newDate.copyWith(hour: newTime.hour, minute: newTime.minute);
-    }
-
-    void popWithDateTime() {
-      final formattedDateTime =
-          DateFormat("yyyy-MM-dd'T'HH:mm:ss").format(date.value);
-      final dtWithOffset = formattedDateTime +
-          Duration(milliseconds: tzOffset.value.offsetInMilliseconds)
-              .formatAsOffset();
-      context.pop(dtWithOffset);
-    }
-
-    return AlertDialog(
-      contentPadding: const EdgeInsets.all(30),
-      alignment: Alignment.center,
-      content: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          const Text(
-            "edit_date_time_dialog_date_time",
-            textAlign: TextAlign.center,
-          ).tr(),
-          TextButton.icon(
-            onPressed: pickDate,
-            icon: Text(
-              DateFormat("dd-MM-yyyy hh:mm a").format(date.value),
-              style: context.textTheme.bodyLarge
-                  ?.copyWith(color: context.primaryColor),
-            ),
-            label: const Icon(
-              Icons.edit_outlined,
-              size: 18,
-            ),
-          ),
-          const Text(
-            "edit_date_time_dialog_timezone",
-            textAlign: TextAlign.center,
-          ).tr(),
-          DropdownMenu(
-            menuHeight: 300,
-            width: 280,
-            inputDecorationTheme: const InputDecorationTheme(
-              border: InputBorder.none,
-              contentPadding: EdgeInsets.zero,
-            ),
-            trailingIcon: Padding(
-              padding: const EdgeInsets.only(right: 10),
-              child: Icon(
-                Icons.arrow_drop_down,
-                color: context.primaryColor,
-              ),
-            ),
-            textStyle: context.textTheme.bodyLarge?.copyWith(
-              color: context.primaryColor,
-            ),
-            menuStyle: const MenuStyle(
-              fixedSize: MaterialStatePropertyAll(Size.fromWidth(350)),
-              alignment: Alignment(-1.25, 0.5),
-            ),
-            onSelected: (value) => tzOffset.value = value!,
-            initialSelection: tzOffset.value,
-            dropdownMenuEntries: timeZones
-                .map(
-                  (t) => DropdownMenuEntry<_TimeZoneOffset>(
-                    value: t,
-                    label: t.display,
-                    style: ButtonStyle(
-                      textStyle: MaterialStatePropertyAll(
-                        context.textTheme.bodyMedium,
-                      ),
-                    ),
-                  ),
-                )
-                .toList(),
-          ),
-        ],
-      ),
-      actions: [
-        TextButton(
-          onPressed: () => context.pop(),
-          child: Text(
-            "action_common_cancel",
-            style: context.textTheme.bodyMedium?.copyWith(
-              fontWeight: FontWeight.w600,
-              color: context.colorScheme.error,
-            ),
-          ).tr(),
-        ),
-        TextButton(
-          onPressed: popWithDateTime,
-          child: Text(
-            "action_common_update",
-            style: context.textTheme.bodyMedium?.copyWith(
-              fontWeight: FontWeight.w600,
-              color: context.primaryColor,
-            ),
-          ).tr(),
-        ),
-      ],
-    );
-  }
-}
-
-class _TimeZoneOffset implements Comparable<_TimeZoneOffset> {
-  final String display;
-  final Location location;
-
-  const _TimeZoneOffset({
-    required this.display,
-    required this.location,
-  });
-
-  _TimeZoneOffset copyWith({
-    String? display,
-    Location? location,
-  }) {
-    return _TimeZoneOffset(
-      display: display ?? this.display,
-      location: location ?? this.location,
-    );
-  }
-
-  int get offsetInMilliseconds => location.currentTimeZone.offset;
-
-  _TimeZoneOffset.fromLocation(tz.Location l)
-      : display = _getFormattedOffset(l.currentTimeZone.offset, l),
-        location = l;
-
-  @override
-  int compareTo(_TimeZoneOffset other) {
-    return offsetInMilliseconds.compareTo(other.offsetInMilliseconds);
-  }
-
-  @override
-  String toString() =>
-      '_TimeZoneOffset(display: $display, location: $location)';
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is _TimeZoneOffset &&
-        other.display == display &&
-        other.offsetInMilliseconds == offsetInMilliseconds;
-  }
-
-  @override
-  int get hashCode =>
-      display.hashCode ^ offsetInMilliseconds.hashCode ^ location.hashCode;
-}

mobile/lib/shared/ui/immich_loading_indicator.dart

@@ -21,7 +21,7 @@ class ImmichLoadingIndicator extends StatelessWidget {
       padding: const EdgeInsets.all(15),
       child: const CircularProgressIndicator(
         color: Colors.white,
-        strokeWidth: 3,
+        strokeWidth: 2,
       ),
     );
   }

mobile/lib/shared/ui/location_picker.dart

@@ -1,256 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:flutter_map/plugin_api.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/string_extensions.dart';
-import 'package:immich_mobile/modules/map/ui/map_thumbnail.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:latlong2/latlong.dart';
-
-Future<LatLng?> showLocationPicker({
-  required BuildContext context,
-  LatLng? initialLatLng,
-}) {
-  return showDialog<LatLng?>(
-    context: context,
-    useRootNavigator: false,
-    builder: (ctx) => _LocationPicker(
-      initialLatLng: initialLatLng,
-    ),
-  );
-}
-
-enum _LocationPickerMode { map, manual }
-
-bool _validateLat(String value) {
-  final l = double.tryParse(value);
-  return l != null && l > -90 && l < 90;
-}
-
-bool _validateLong(String value) {
-  final l = double.tryParse(value);
-  return l != null && l > -180 && l < 180;
-}
-
-class _LocationPicker extends HookWidget {
-  final LatLng? initialLatLng;
-
-  const _LocationPicker({
-    this.initialLatLng,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final latitude = useState(initialLatLng?.latitude ?? 0.0);
-    final longitude = useState(initialLatLng?.longitude ?? 0.0);
-    final latlng = LatLng(latitude.value, longitude.value);
-    final pickerMode = useState(_LocationPickerMode.map);
-    final latitudeController = useTextEditingController();
-    final isValidLatitude = useState(true);
-    final latitiudeFocusNode = useFocusNode();
-    final longitudeController = useTextEditingController();
-    final longitudeFocusNode = useFocusNode();
-    final isValidLongitude = useState(true);
-
-    void validateInputs() {
-      isValidLatitude.value = _validateLat(latitudeController.text);
-      if (isValidLatitude.value) {
-        latitude.value = latitudeController.text.toDouble();
-      }
-      isValidLongitude.value = _validateLong(longitudeController.text);
-      if (isValidLongitude.value) {
-        longitude.value = longitudeController.text.toDouble();
-      }
-    }
-
-    void validateAndPop() {
-      if (pickerMode.value == _LocationPickerMode.manual) {
-        validateInputs();
-      }
-      if (isValidLatitude.value && isValidLongitude.value) {
-        return context.pop(latlng);
-      }
-    }
-
-    List<Widget> buildMapPickerMode() {
-      return [
-        TextButton.icon(
-          icon: Text(
-            "${latitude.value.toStringAsFixed(4)}, ${longitude.value.toStringAsFixed(4)}",
-          ),
-          label: const Icon(Icons.edit_outlined, size: 16),
-          onPressed: () {
-            latitudeController.text = latitude.value.toStringAsFixed(4);
-            longitudeController.text = longitude.value.toStringAsFixed(4);
-            pickerMode.value = _LocationPickerMode.manual;
-          },
-        ),
-        const SizedBox(
-          height: 12,
-        ),
-        MapThumbnail(
-          coords: latlng,
-          height: 200,
-          width: 200,
-          zoom: 6,
-          showAttribution: false,
-          onTap: (p0, p1) async {
-            final newLatLng = await context.autoPush<LatLng?>(
-              MapLocationPickerRoute(initialLatLng: latlng),
-            );
-            if (newLatLng != null) {
-              latitude.value = newLatLng.latitude;
-              longitude.value = newLatLng.longitude;
-            }
-          },
-          markers: [
-            Marker(
-              anchorPos: AnchorPos.align(AnchorAlign.top),
-              point: LatLng(
-                latitude.value,
-                longitude.value,
-              ),
-              builder: (ctx) => const Image(
-                image: AssetImage('assets/location-pin.png'),
-              ),
-            ),
-          ],
-        ),
-      ];
-    }
-
-    List<Widget> buildManualPickerMode() {
-      return [
-        TextButton.icon(
-          icon: const Text("location_picker_choose_on_map").tr(),
-          label: const Icon(Icons.map_outlined, size: 16),
-          onPressed: () {
-            validateInputs();
-            if (isValidLatitude.value && isValidLongitude.value) {
-              pickerMode.value = _LocationPickerMode.map;
-            }
-          },
-        ),
-        const SizedBox(
-          height: 12,
-        ),
-        TextField(
-          controller: latitudeController,
-          focusNode: latitiudeFocusNode,
-          textInputAction: TextInputAction.done,
-          autofocus: false,
-          decoration: InputDecoration(
-            labelText: 'location_picker_latitude'.tr(),
-            labelStyle: TextStyle(
-              fontWeight: FontWeight.bold,
-              color: context.primaryColor,
-            ),
-            floatingLabelBehavior: FloatingLabelBehavior.auto,
-            border: const OutlineInputBorder(),
-            hintText: 'location_picker_latitude_hint'.tr(),
-            hintStyle: const TextStyle(
-              fontWeight: FontWeight.normal,
-              fontSize: 14,
-            ),
-            errorText: isValidLatitude.value
-                ? null
-                : "location_picker_latitude_error".tr(),
-          ),
-          onEditingComplete: () {
-            isValidLatitude.value = _validateLat(latitudeController.text);
-            if (isValidLatitude.value) {
-              latitude.value = latitudeController.text.toDouble();
-              longitudeFocusNode.requestFocus();
-            }
-          },
-          keyboardType: const TextInputType.numberWithOptions(decimal: true),
-          inputFormatters: [LengthLimitingTextInputFormatter(8)],
-          onTapOutside: (_) => latitiudeFocusNode.unfocus(),
-        ),
-        const SizedBox(
-          height: 24,
-        ),
-        TextField(
-          controller: longitudeController,
-          focusNode: longitudeFocusNode,
-          textInputAction: TextInputAction.done,
-          autofocus: false,
-          decoration: InputDecoration(
-            labelText: 'location_picker_longitude'.tr(),
-            labelStyle: TextStyle(
-              fontWeight: FontWeight.bold,
-              color: context.primaryColor,
-            ),
-            floatingLabelBehavior: FloatingLabelBehavior.auto,
-            border: const OutlineInputBorder(),
-            hintText: 'location_picker_longitude_hint'.tr(),
-            hintStyle: const TextStyle(
-              fontWeight: FontWeight.normal,
-              fontSize: 14,
-            ),
-            errorText: isValidLongitude.value
-                ? null
-                : "location_picker_longitude_error".tr(),
-          ),
-          onEditingComplete: () {
-            isValidLongitude.value = _validateLong(longitudeController.text);
-            if (isValidLongitude.value) {
-              longitude.value = longitudeController.text.toDouble();
-              longitudeFocusNode.unfocus();
-            }
-          },
-          keyboardType: const TextInputType.numberWithOptions(decimal: true),
-          inputFormatters: [LengthLimitingTextInputFormatter(8)],
-          onTapOutside: (_) => longitudeFocusNode.unfocus(),
-        ),
-      ];
-    }
-
-    return AlertDialog(
-      contentPadding: const EdgeInsets.all(30),
-      alignment: Alignment.center,
-      content: SingleChildScrollView(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            const Text(
-              "edit_location_dialog_title",
-              textAlign: TextAlign.center,
-            ).tr(),
-            const SizedBox(
-              height: 12,
-            ),
-            if (pickerMode.value == _LocationPickerMode.manual)
-              ...buildManualPickerMode(),
-            if (pickerMode.value == _LocationPickerMode.map)
-              ...buildMapPickerMode(),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: () => context.pop(),
-          child: Text(
-            "action_common_cancel",
-            style: context.textTheme.bodyMedium?.copyWith(
-              fontWeight: FontWeight.w600,
-              color: context.colorScheme.error,
-            ),
-          ).tr(),
-        ),
-        TextButton(
-          onPressed: validateAndPop,
-          child: Text(
-            "action_common_update",
-            style: context.textTheme.bodyMedium?.copyWith(
-              fontWeight: FontWeight.w600,
-              color: context.primaryColor,
-            ),
-          ).tr(),
-        ),
-      ],
-    );
-  }
-}

mobile/lib/shared/ui/scaffold_error_body.dart

@@ -4,9 +4,9 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 
 // Error widget to be used in Scaffold when an AsyncError is received
 class ScaffoldErrorBody extends StatelessWidget {
-  final bool withIcon;
+  final IconData icon;
 
-  const ScaffoldErrorBody({super.key, this.withIcon = true});
+  const ScaffoldErrorBody({this.icon = Icons.error_outline, super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -14,22 +14,19 @@ class ScaffoldErrorBody extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.center,
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        Text(
+        const Text(
-          "scaffold_body_error_occurred",
+          "scaffold_body_error_occured",
-          style: context.textTheme.displayMedium,
+          style:
+              TextStyle(fontSize: 14, fontWeight: FontWeight.bold, height: 3),
           textAlign: TextAlign.center,
         ).tr(),
-        if (withIcon)
+        Center(
-          Center(
+          child: Icon(
-            child: Padding(
+            icon,
-              padding: const EdgeInsets.only(top: 15),
+            size: 100,
-              child: Icon(
+            color: context.themeData.iconTheme.color?.withOpacity(0.5),
-                Icons.error_outline,
-                size: 100,
-                color: context.themeData.iconTheme.color?.withOpacity(0.5),
-              ),
-            ),
           ),
+        ),
       ],
     );
   }

mobile/lib/shared/views/app_log_detail_page.dart

@@ -39,14 +39,7 @@ class AppLogDetailPage extends HookConsumerWidget {
                     Clipboard.setData(ClipboardData(text: stackTrace))
                         .then((_) {
                       ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
+                        const SnackBar(content: Text("Copied to clipboard")),
-                          content: Text(
-                            "Copied to clipboard",
-                            style: context.textTheme.bodyLarge?.copyWith(
-                              color: context.primaryColor,
-                            ),
-                          ),
-                        ),
                       );
                     });
                   },
@@ -105,14 +98,7 @@ class AppLogDetailPage extends HookConsumerWidget {
                   onPressed: () {
                     Clipboard.setData(ClipboardData(text: message)).then((_) {
                       ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
+                        const SnackBar(content: Text("Copied to clipboard")),
-                          content: Text(
-                            "Copied to clipboard",
-                            style: context.textTheme.bodyLarge?.copyWith(
-                              color: context.primaryColor,
-                            ),
-                          ),
-                        ),
                       );
                     });
                   },

mobile/lib/shared/views/immich_loading_overlay.dart

@@ -1,64 +1,41 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 
-final _loadingEntry = OverlayEntry(
+class ImmichLoadingOverlay extends StatelessWidget {
-  builder: (context) => SizedBox.square(
+  const ImmichLoadingOverlay({
-    dimension: double.infinity,
+    Key? key,
-    child: DecoratedBox(
+  }) : super(key: key);
-      decoration:
-          BoxDecoration(color: context.colorScheme.surface.withAlpha(200)),
-      child: const Center(child: ImmichLoadingIndicator()),
-    ),
-  ),
-);
 
-ValueNotifier<bool> useProcessingOverlay() {
+  @override
-  return use(const _LoadingOverlay());
+  Widget build(BuildContext context) {
+    return ValueListenableBuilder<bool>(
+      valueListenable:
+          ImmichLoadingOverlayController.appLoader.loaderShowingNotifier,
+      builder: (context, shouldShow, child) {
+        return shouldShow
+            ? const Scaffold(
+                backgroundColor: Colors.black54,
+                body: Center(
+                  child: ImmichLoadingIndicator(),
+                ),
+              )
+            : const SizedBox();
+      },
+    );
+  }
 }
 
-class _LoadingOverlay extends Hook<ValueNotifier<bool>> {
+class ImmichLoadingOverlayController {
-  const _LoadingOverlay();
+  static final ImmichLoadingOverlayController appLoader =
+      ImmichLoadingOverlayController();
+  ValueNotifier<bool> loaderShowingNotifier = ValueNotifier(false);
+  ValueNotifier<String> loaderTextNotifier = ValueNotifier('error message');
 
-  @override
+  void show() {
-  _LoadingOverlayState createState() => _LoadingOverlayState();
+    loaderShowingNotifier.value = true;
-}
+  }
-
+
-class _LoadingOverlayState
+  void hide() {
-    extends HookState<ValueNotifier<bool>, _LoadingOverlay> {
+    loaderShowingNotifier.value = false;
-  late final _isProcessing = ValueNotifier(false)..addListener(_listener);
+  }
-  OverlayEntry? overlayEntry;
-
-  void _listener() {
-    setState(() {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (_isProcessing.value) {
-          overlayEntry?.remove();
-          overlayEntry = _loadingEntry;
-          Overlay.of(context).insert(_loadingEntry);
-        } else {
-          overlayEntry?.remove();
-          overlayEntry = null;
-        }
-      });
-    });
-  }
-
-  @override
-  ValueNotifier<bool> build(BuildContext context) {
-    return _isProcessing;
-  }
-
-  @override
-  void dispose() {
-    _isProcessing.dispose();
-    super.dispose();
-  }
-
-  @override
-  Object? get debugValue => _isProcessing.value;
-
-  @override
-  String get debugLabel => 'useProcessingOverlay<>';
 }