sort imports

Resolve merge conflicts
Merge branch 'main' into rust_processing
2025-07-23 19:48:22 +02:00 · 2025-07-23 19:47:44 +02:00 · 2025-07-23 19:38:05 +02:00 · 2025-07-23 13:50:19 +02:00 · 2025-07-23 13:45:37 +02:00 · 2025-07-23 13:40:25 +02:00
270 changed files with 9222 additions and 3331 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,39 +1,22 @@
 name: Report a bug
-description: For regressions only (things that were working earlier)
+description: Things that were working earlier but don't anymore
 labels: []
 body:
    - type: markdown
      attributes:
          value: |
-              Before opening a new issue, **please** ensure
-              1. You are on the latest version,
-              2. You've searched for existing issues,
-              3. It was working earlier (otherwise use [this](https://github.com/ente-io/ente/discussions/categories/enhancements))
-              4. It is not about self hosting (otherwise use [this](https://github.com/ente-io/ente/discussions/categories/q-a))
+              **Checklist**
+              1. You've searched existing [issues](https://github.com/search?q=repo%3Aente-io%2Fente+&type=issues) and [discussions](https://github.com/search?q=repo%3Aente-io%2Fente+&type=discussions)
+              2. It was working earlier (otherwise use [enhancements](https://github.com/ente-io/ente/discussions/categories/enhancements))
+              3. It is not about self hosting (for those use [this](https://github.com/ente-io/ente/discussions/categories/q-a))
    - type: textarea
      attributes:
          label: Description
-          description: >
-              Describe the bug and steps to reproduce the behaviour, and how it
-              differs from the previously working behaviour.
-      validations:
-          required: true
    - type: input
      attributes:
          label: Version
          description: The version can be seen at the bottom of settings.
          placeholder: e.g. v1.2.3
-    - type: input
-      attributes:
-          label: Last working version
-          description: >
-              The version where things were last known to be working. It is fine
-              if you don't remember the exact version (mention roughly then),
-              but **if there just isn't a last working version, then please file
-              it as an
-              [enhancement](https://github.com/ente-io/ente/discussions/categories/enhancements))**
-              (where the community upvotes can be used to help prioritize).
-          placeholder: e.g. v1.2.3
    - type: dropdown
      attributes:
          label: What product are you using?
--- a/.github/workflows/auth-internal-release.yml
+++ b/.github/workflows/auth-internal-release.yml
@@ -4,7 +4,7 @@ on:
    workflow_dispatch: # Allow manually running the action

 env:
-    FLUTTER_VERSION: "3.29.3"
+    FLUTTER_VERSION: "3.24.3"

 permissions:
    contents: write
--- a/.github/workflows/auth-lint.yml
+++ b/.github/workflows/auth-lint.yml
@@ -8,7 +8,7 @@ on:
            - ".github/workflows/auth-lint.yml"

 env:
-    FLUTTER_VERSION: "3.29.3"
+    FLUTTER_VERSION: "3.24.3"

 permissions:
    contents: read
--- a/.github/workflows/auth-release.yml
+++ b/.github/workflows/auth-release.yml
@@ -29,7 +29,7 @@ on:
            - "auth-v*"

 env:
-    FLUTTER_VERSION: "3.29.3"
+    FLUTTER_VERSION: "3.24.3"

 permissions:
    contents: write
--- a/.github/workflows/auth-win-sign.yml
+++ b/.github/workflows/auth-win-sign.yml
@@ -5,7 +5,7 @@ on:
    workflow_dispatch: # Allow manually running the action

 env:
-    FLUTTER_VERSION: "3.29.3"
+    FLUTTER_VERSION: "3.24.3"

 permissions:
    contents: write
--- a/.github/workflows/mobile-internal-release-rust.yml
+++ b/.github/workflows/mobile-internal-release-rust.yml
@@ -4,7 +4,7 @@ on:
    workflow_dispatch: # Allow manually running the action

 env:
-    FLUTTER_VERSION: "3.29.3"
+    FLUTTER_VERSION: "3.24.3"
    RUST_VERSION: "1.85.1"

 permissions:
--- a/.github/workflows/mobile-internal-release.yml
+++ b/.github/workflows/mobile-internal-release.yml
@@ -4,7 +4,7 @@ on:
    workflow_dispatch: # Allow manually running the action

 env:
-    FLUTTER_VERSION: "3.29.3"
+    FLUTTER_VERSION: "3.24.3"

 permissions:
    contents: write
--- a/.github/workflows/mobile-lint.yml
+++ b/.github/workflows/mobile-lint.yml
@@ -8,7 +8,7 @@ on:
            - ".github/workflows/mobile-lint.yml"

 env:
-    FLUTTER_VERSION: "3.29.3"
+    FLUTTER_VERSION: "3.24.3"

 permissions:
    contents: read
--- a/.github/workflows/mobile-release.yml
+++ b/.github/workflows/mobile-release.yml
@@ -9,7 +9,7 @@ on:
            - "photos-v*"

 env:
-    FLUTTER_VERSION: "3.29.3"
+    FLUTTER_VERSION: "3.24.3"

 permissions:
    contents: write
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,54 +1,42 @@
 # Contributing

-First and foremost, thank you for your interest in contributing to Ente 🙏
-
-There are many ways to contribute, and most of them don't require writing code.
-
-* [Spread the word](#spread-the-word)
-* [Engage with the community](#engage-with-the-community)
-* [Translate](#translate)
-* [Document](#document)
-
+- [Spread the word](#spread-the-word)
+- [Engage with the community](#engage-with-the-community)
+- [Translate](#translate)
+- [Document](#document)

 ## Spread the word

-This is perhaps the most impactful contribution you can make. [Spread the
-word](https://help.ente.io/photos/features/referral-program/). Online on your
-favorite social media channels. Offline to your friends and family who are
-looking for a privacy-friendly alternative to big tech.
+**This is the most impactful contribution you can make**.
+
+[Spread the word](https://help.ente.io/photos/features/referral-program/). Online on your favorite social media channels. Offline to your friends and family who are looking for a privacy-friendly alternative to big tech.

 ## Engage with the community

-Just hang around, enjoy the vibe. Answer someone's query on our
-[Discord](https://discord.gg/z2YVKkycX3), or pile on in the sporadic #off-topic
-rants there. Chuckle (or wince!) at our [Twitter](https://twitter.com/enteio)
-memes. Suggest a new feature in our [Github
-Discussions](https://github.com/ente-io/ente/discussions/new?category=enhancements),
-or upvote the existing ones that you feel we should focus on first. Provide your
-opinion on existing threads.
+Just hang around, enjoy the vibe. The Ente community — the people who are building Ente, and the people who are using Ente — hang out at various places depending on their proclivity:

-These might seem like small things, but it provides us energy. Knowing that
-there is a community of people who care for what we are building.
+- [Discord](https://discord.ente.io)
+- [Mastodon](https://fosstodon.org/@ente)
+- [X / Twitter](https://twitter.com/enteio)
+- [Github Discussions](https://github.com/ente-io/ente/discussions)
+
+Just being around might seem a small thing, but it provides us energy. Knowing that there is a community of people who care for what we are building, **who want us to do better**.

 ## Translate

-If you're interested in helping out with translation, please visit our Crowdin
-projects to get started:
-
-| Project  |  |
-| ------------- | ------------- |
-| [Auth](https://crowdin.com/project/ente-authenticator-app)  | [![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app)  |
-| [Photos](https://crowdin.com/project/ente-photos-app)  | [![Crowdin](https://badges.crowdin.net/ente-photos-app/localized.svg)](https://crowdin.com/project/ente-photos-app)  |
-| [Photos Web / Desktop](https://crowdin.com/project/ente-photos-web)  | [![Crowdin](https://badges.crowdin.net/ente-photos-web/localized.svg)](https://crowdin.com/project/ente-photos-web)  |
+Visit our Crowdin projects to help with translations:

+| Project                                                             |                                                                                                                                   |
+| ------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| [Auth](https://crowdin.com/project/ente-authenticator-app)          | [![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app) |
+| [Photos](https://crowdin.com/project/ente-photos-app)               | [![Crowdin](https://badges.crowdin.net/ente-photos-app/localized.svg)](https://crowdin.com/project/ente-photos-app)               |
+| [Photos Web / Desktop](https://crowdin.com/project/ente-photos-web) | [![Crowdin](https://badges.crowdin.net/ente-photos-web/localized.svg)](https://crowdin.com/project/ente-photos-web)               |

 If your language is not listed for translation, please [create a GitHub
 issue](https://github.com/ente-io/ente/issues/new?title=Request+for+New+Language+Translation&body=Language+name%3A+%0AProject%3A+auth%2Fphotos%2Fboth)
 to have it added. It is okay to have partial translations. Once ~90% of the
 strings in a language get translated, we will start surfacing it in the apps.

-Thank you for your support.
-
 ## Document

 The help guides and FAQs for users of Ente products are also open source, and
@@ -60,25 +48,9 @@ See [docs/](docs/README.md) for how to edit these documents.

 ## Code contributions

-Code is a small aspect of community, and the ways mentioned above are more
-important in helping us. But if you'd _really_ like to contribute code, it is
-best to start small. Consider some well-scoped changes, say like adding more
-[custom icons to auth](auth/docs/adding-icons.md).
+If you'd like to contribute code, it is best to start small. Consider some well-scoped changes, say like adding more [custom icons to auth](auth/docs/adding-icons.md), or fixing a specific bug.

-Each of the individual product/platform specific directories in this repository
-have instructions on setting up a dev environment.
-
-For anything beyond trivial bug fixes, please use
-[discussions](https://github.com/ente-io/ente/discussions) instead of performing
-code changes directly.
-
-> [!TIP]
->
-> Please remember that code is a important, but small, part of the overall big
-> picture that makes a product a joy to use. Something that's easy in code is
-> not necessarily the right choice for the product as a whole. So we'll repeat -
-> there are other ways to contribute than code that we'd request you to
-> consider.
+Code that changes the behaviour of the product might not get merged, at least not initially. The PR can serve as a discussion bed, but you might find it easier to just start a discussion instead, or post your perspective in the (likely) existing thread about the behaviour change or new feature you wish for.

 ## Leave a review or star

--- a/mobile/apps/auth/.fvmrc
+++ b/mobile/apps/auth/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.29.3"
+  "flutter": "3.24.3"
 }
--- a/mobile/apps/auth/.gitignore
+++ b/mobile/apps/auth/.gitignore
@@ -44,5 +44,4 @@ android/key.properties
 dist/

 # FVM Version Cache
-.fvm/
-lib/l10n/arb/*.dart
+.fvm/
--- a/mobile/apps/auth/README.md
+++ b/mobile/apps/auth/README.md
@@ -44,7 +44,7 @@ or managing your secrets, please use our mobile or desktop app.

 ## 🧑‍💻 Build from source

-1. [Install Flutter v3.29.3](https://flutter.dev/docs/get-started/install).
+1. [Install Flutter](https://flutter.dev/docs/get-started/install)

 2. Pull in all submodules with `git submodule update --init --recursive`

--- a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
+++ b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
@@ -71,6 +71,9 @@
      ],
      "hex": "fd4b2d"
    },
+    {
+      "title": "availity"
+    },
    {
      "title": "AzurHosts",
      "slug": "azurhosts",
@@ -121,6 +124,13 @@
    {
      "title": "Belo"
    },
+    {
+      "title": "bestbuy",
+      "altNames": [
+        "Best Buy",
+        "bestbuy.com"
+      ]
+    },
    {
      "title": "Bethesda",
      "altNames": [
@@ -292,6 +302,25 @@
    {
      "title": "CoinDCX"
    },
+    {
+      "title": "colorado",
+      "altNames": [
+        "Colorado.gov",
+        "Colorado Gov",
+        "Colorado Government",
+        "Colorado Government Portal",
+        "Colorado COVES Death Certificates",
+        "Colorado COVES",
+        "Colorado Official State Web Portal",
+        "Colorado State Web Portal",
+        "Colorado State Portal",
+        "Colorado Web Portal",
+        "Colorado Portal",
+        "Colorado State",
+        "Colorado PEAK",
+        "myColorado"
+      ]
+    },
    {
      "title": "ConfigCat"
    },
@@ -403,6 +432,13 @@
        "Murena"
      ]
    },
+    {
+      "title": "emeritihealth",
+      "altNames": [
+        "Emeriti Health",
+        "Emeriti Retirement Health",
+      ]
+    },
    {
      "title": "eneba"
    },
@@ -706,6 +742,14 @@
    {
      "title": "Letterboxd"
    },
+    {
+      "title": "lincolnfinancial",
+      "altNames": [
+        "Lincoln Financial",
+        "Lincoln Financial Group",
+        "LFG"
+      ]
+    },
    {
      "title": "LinkedIn",
      "slug": "linkedin"
@@ -842,6 +886,9 @@
      "title": "Name.com",
      "slug": "name_com"
    },
+    {
+      "title": "nasdaq"
+    },
    {
      "title": "Nextcloud",
      "slug": "nextcloud"
@@ -926,6 +973,9 @@
    {
      "title": "NuCommunity"
    },
+    {
+      "title": "numerai"
+    },
    {
      "title": "NVIDIA"
    },
@@ -956,6 +1006,10 @@
      "title": "Oracle Cloud",
      "slug": "oracle_cloud"
    },
+    {
+      "title": "Pangolin",
+      "slug": "pangolin"
+    },
    {
      "title": "Parqet",
      "slug": "parqet"
@@ -1241,6 +1295,10 @@
        "PAYDAY 3"
      ]
    },
+    {
+      "title": "Startmail",
+      "slug": "startmail"
+    },
    {
      "title": "STRATO",
      "hex": "FF8800"
@@ -1374,6 +1432,16 @@
      "title": "Ubuntu One",
      "slug": "ubuntu_one"
    },
+    {
+      "title": "unitedhealthgroup",
+      "altNames": [
+        "Unitedhealth Group",
+        "United Healthgroup",
+        "UHG",
+        "uhg.com",
+        "unitedhealthgroup.com"
+      ]
+    },
    {
      "title": "Unity",
      "hex": "858585"
--- a/mobile/apps/auth/assets/custom-icons/icons/availity.svg
+++ b/mobile/apps/auth/assets/custom-icons/icons/availity.svg
--- a/mobile/apps/auth/assets/custom-icons/icons/bestbuy.svg
+++ b/mobile/apps/auth/assets/custom-icons/icons/bestbuy.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 638 638"><defs><style>.cls-1{fill:#104ab8;}.cls-1,.cls-2,.cls-3,.cls-4{fill-rule:evenodd;}.cls-2{fill:#fff;}.cls-3{fill:#ffed31;}.cls-4{fill:#1c252c;}</style></defs><title>Best Buy Logo Vector</title><g id="logo-en"><polygon class="cls-1" points="0 0 638 0 638 638 0 638 0 0 0 0"/><path class="cls-2" d="M232,347.26V482.49h70.8c27.87,0,53.62-9.78,53.62-38.51,0-19.42-14-28.29-29.38-32.93,9.37-3.76,20-11.66,20-28.23,0-21.2-21-35.56-49.35-35.56Zm43.37,31.5h15.95c6.49,0,11.44,5.08,11.44,10.24,0,4.8-5.14,9.93-11.44,9.93H275.41V378.76Zm0,48.23h21c7.35,0,13.52,5.59,13.52,12,0,6.78-5.77,12.4-14.79,12.4H275.41V427Z" transform="translate(-181 -181)"/><path class="cls-2" d="M267.12,497.24V632.46h70.8c27.87,0,53.62-9.78,53.62-38.51,0-19.42-14-28.29-29.38-32.93,9.38-3.76,20-11.66,20-28.22,0-21.2-21-35.56-49.35-35.56Zm43.37,31.49h15.95c6.49,0,11.44,5.08,11.44,10.25,0,4.79-5.14,9.92-11.44,9.92H310.49V528.73Zm0,48.24h21.05c7.35,0,13.52,5.58,13.52,12,0,6.77-5.77,12.4-14.79,12.4H310.49V577Z" transform="translate(-181 -181)"/><polygon class="cls-2" points="178.87 301.47 178.87 166.25 287.94 166.25 287.94 198.9 222.11 198.9 222.11 216.64 275.56 216.64 275.56 247.25 222.11 247.25 222.11 268.94 287.94 268.94 287.94 301.47 178.87 301.47 178.87 301.47"/><path class="cls-2" d="M528,486.34c30.7,0,55.26-17.51,55.26-45.89,0-45.8-59.58-38.75-59.58-53,0-5.51,5.79-8.43,11.73-8.43,10.24,0,17.64,6.74,17.64,6.74l25.63-24.41c-10.25-9.75-26.44-18-48.26-18-32.75,0-54.19,19.45-54.19,42.9,0,46.38,58.73,39.65,58.73,54.2,0,5.11-4.91,10.24-13.81,10.24-10.11,0-18.12-6.1-24.35-11.28L471,464c10.38,10.12,27,22.32,57,22.32Z" transform="translate(-181 -181)"/><polygon class="cls-2" points="435.66 301.47 435.66 198.78 399.94 198.78 399.94 166.25 514.75 166.25 514.75 198.78 479.04 198.78 479.04 301.47 435.66 301.47 435.66 301.47"/><path class="cls-2" d="M393,497.14h43.25v81c0,8.22,8.19,15.8,16.72,15.8,8.05,0,16.19-6.84,16.19-16.23V497.14h43.12v80c0,31.76-26.36,57.09-60.45,57.09-34.28,0-58.83-27.57-58.83-58.82V497.14Z" transform="translate(-181 -181)"/><polygon class="cls-2" points="384.63 451.37 384.63 403.05 333.81 316.14 377.56 316.14 406.32 362.7 435.18 316.14 479.04 316.14 428.01 403.54 428.01 451.37 384.63 451.37 384.63 451.37"/><polygon class="cls-3" points="479.04 390.15 453.52 415.66 453.52 450.11 479.04 475.62 586.96 475.62 586.96 390.15 479.04 390.15 479.04 390.15"/><path class="cls-4" d="M655.85,613.87a5.75,5.75,0,1,1-5.75-5.74,5.74,5.74,0,0,1,5.75,5.74Z" transform="translate(-181 -181)"/></g></svg>
--- a/mobile/apps/auth/assets/custom-icons/icons/colorado.svg
+++ b/mobile/apps/auth/assets/custom-icons/icons/colorado.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="254" height="197">
+<path d="M0 0 C83.82 0 167.64 0 254 0 C254 65.01 254 130.02 254 197 C170.18 197 86.36 197 0 197 C0 131.99 0 66.98 0 0 Z " fill="#255E39" transform="translate(0,0)"/>
+<path d="M0 0 C83.82 0 167.64 0 254 0 C254 20.13 254 40.26 254 61 C252 58 252 58 250.44140625 55.1015625 C245.56357778 46.07605867 239.90237971 38.57068879 233 31 C232.40574219 30.32324219 231.81148437 29.64648438 231.19921875 28.94921875 C220.24437377 17.12451014 203.62450839 8.5338504 188 5 C186.79472656 4.72285156 185.58945313 4.44570312 184.34765625 4.16015625 C158.77417322 -1.25753788 132.93293113 2.2138374 110.6875 16.3125 C104.6016815 20.31637252 99.20467262 24.91572017 94 30 C92.94425781 31.01513672 92.94425781 31.01513672 91.8671875 32.05078125 C88.51106627 35.20766805 88.51106627 35.20766805 86 39 C81.91471475 37.63823825 81.46098573 35.78559446 79.3828125 32.05859375 C79.04377899 31.45749283 78.70474548 30.85639191 78.35543823 30.23707581 C77.26990008 28.30862811 76.19708095 26.37345578 75.125 24.4375 C73.71411291 21.91357977 72.29846937 19.39234086 70.8828125 16.87109375 C70.54493713 16.26711761 70.20706177 15.66314148 69.85894775 15.04086304 C67.36815994 10.6040756 64.75182831 6.27882324 62 2 C59.33448576 4.40817141 57.69828306 6.99238148 55.91796875 10.1015625 C55.32242188 11.13708252 54.726875 12.17260254 54.11328125 13.23950195 C53.47777344 14.35671631 52.84226563 15.47393066 52.1875 16.625 C51.52109934 17.78945891 50.85442872 18.95376337 50.1875 20.11791992 C40.93068749 36.30218373 31.75265124 52.53667981 23 69 C27.95 68.01 32.9 67.02 38 66 C35.92604704 72.67301098 33.33060795 78.79820286 30.25 85.0625 C29.27859712 87.06444928 28.30863363 89.06709742 27.33984375 91.0703125 C26.54876221 92.70468262 26.54876221 92.70468262 25.74169922 94.37207031 C22.3730026 101.36581172 19.10119743 108.40590787 15.8125 115.4375 C15.13382358 116.88746733 14.45511339 118.33741885 13.77636719 119.78735352 C12.18329197 123.1911238 10.59131013 126.59540409 9 130 C12.34653694 130 15.42039041 128.66450025 18.58984375 127.65625 C21 127 21 127 24 127 C22.01427175 133.18398243 19.7878242 139.22422353 17.34765625 145.2421875 C17.00625107 146.09120636 16.66484589 146.94022522 16.31309509 147.81497192 C15.23207037 150.50266587 14.14761226 153.188954 13.0625 155.875 C6.77912222 171.34098251 6.77912222 171.34098251 1 187 C2.11632812 186.61328125 3.23265625 186.2265625 4.3828125 185.828125 C33.68892175 175.93751189 66.60784235 172.70374295 97 180 C97.66676758 180.1551709 98.33353516 180.3103418 99.02050781 180.47021484 C108.69943089 182.7670275 118.15151684 185.81999107 127.46875 189.29296875 C128.6546875 189.73253906 129.840625 190.17210937 131.0625 190.625 C132.12597656 191.02976563 133.18945312 191.43453125 134.28515625 191.8515625 C143.57746226 194.72426278 152.62428287 195.36040388 162.3125 195.3125 C164.10361206 195.30404053 164.10361206 195.30404053 165.9309082 195.29541016 C174.3610904 195.1791794 181.93838254 194.62771049 190 192 C190.93513428 191.70198486 190.93513428 191.70198486 191.88916016 191.39794922 C217.24006336 183.15751684 235.08132548 168.03878987 248.72729492 145.21801758 C251.80476766 140.09761617 251.80476766 140.09761617 254 139 C254 158.14 254 177.28 254 197 C170.18 197 86.36 197 0 197 C0 131.99 0 66.98 0 0 Z " fill="#FDFDFD" transform="translate(0,0)"/>
+<path d="M0 0 C0.65613281 0.47308594 1.31226563 0.94617187 1.98828125 1.43359375 C8.19172898 6.28906392 12.5611382 12.98165036 16 20 C24.23839404 17.77769262 32.0090674 14.65817187 39.875 11.375 C42.26721473 10.38036914 44.66040281 9.38807517 47.0546875 8.3984375 C48.10124512 7.96192871 49.14780273 7.52541992 50.22607422 7.07568359 C53 6 53 6 57 5 C57 30.41 57 55.82 57 82 C56.01 82.495 56.01 82.495 55 83 C55 81.35 55 79.7 55 78 C51.21452654 76.50479006 47.4282773 75.01156244 43.64135742 73.52001953 C42.35827504 73.01435393 41.0753909 72.50818496 39.79272461 72.00146484 C31.90172043 68.88456448 23.99310874 65.84575736 16 63 C15.525625 64.093125 15.05125 65.18625 14.5625 66.3125 C8.10206161 78.96512328 -2.35460415 87.70575421 -15.4375 93 C-29.87838266 97.0535811 -45.55564041 96.50754481 -58.859375 89.4921875 C-73.15897526 80.99933099 -81.70929125 69.15197361 -86.08203125 53.2265625 C-88.73289686 42.16808167 -87.6277083 31.38695655 -83 21 C-82.39865234 19.61554688 -82.39865234 19.61554688 -81.78515625 18.203125 C-75.22740726 4.7454836 -63.31358344 -4.70987829 -49.4375 -9.9375 C-32.12753124 -14.39739533 -14.1778871 -10.52355405 0 0 Z " fill="#FBFAFA" transform="translate(197,57)"/>
+<path d="M0 0 C4.17781518 3.50676714 8.11713034 7.1703933 12 11 C12.80566406 11.79277344 13.61132812 12.58554687 14.44140625 13.40234375 C22.19006532 21.50137697 28.59401999 31.29414841 32 42 C31.29689697 42.29277832 30.59379395 42.58555664 29.86938477 42.88720703 C28.88252686 43.29825684 27.89566895 43.70930664 26.87890625 44.1328125 C25.7820752 44.58946289 24.68524414 45.04611328 23.55517578 45.51660156 C21.21112215 46.49465882 18.86831579 47.47571148 16.52685547 48.45996094 C13.00083028 49.94082264 9.46957562 51.40863582 5.9375 52.875 C4.72900391 53.38546875 3.52050781 53.8959375 2.27539062 54.421875 C1.12103516 54.89882812 -0.03332031 55.37578125 -1.22265625 55.8671875 C-2.26172119 56.30144043 -3.30078613 56.73569336 -4.37133789 57.18310547 C-7 58 -7 58 -10 57 C-11.4296875 54.92578125 -11.4296875 54.92578125 -12.875 52.3125 C-19.42601148 40.51709955 -29.84217649 32.8446492 -42.5625 28.65625 C-56.42990775 24.92271714 -71.13091577 25.7886915 -83.85546875 32.5078125 C-97.34889321 40.51080907 -106.24401068 52.0414341 -110.5546875 67.203125 C-111.02309404 70.14504676 -111.01460289 72.9684764 -110.99194336 75.94140625 C-111.02545456 84.76399115 -111.02545456 84.76399115 -114.08203125 88.640625 C-116.9592845 90.92925563 -119.95266091 92.94464306 -123 95 C-125.07005107 96.76090923 -127.03276148 98.62570442 -129 100.5 C-143.70570026 114.18796331 -143.70570026 114.18796331 -150 117 C-159.57148912 93.63001896 -160.76344158 66.4060235 -151.12304688 42.85791016 C-141.87944936 21.5593662 -127.22320872 4.39468338 -107 -7 C-106.02675781 -7.56203125 -105.05351563 -8.1240625 -104.05078125 -8.703125 C-71.86898073 -26.08920004 -28.99166492 -22.13908958 0 0 Z " fill="#C30230" transform="translate(222,20)"/>
+<path d="M0 0 C4.45538794 1.64894619 8.90185574 3.3200767 13.34472656 5.00244141 C15.22690683 5.70955694 17.1119842 6.40898279 18.99902344 7.10302734 C22.15076109 8.26257362 25.29431886 9.44248243 28.4375 10.625 C29.46238525 10.99681396 30.48727051 11.36862793 31.54321289 11.75170898 C32.97395142 12.29613647 32.97395142 12.29613647 34.43359375 12.8515625 C35.71834595 13.32843506 35.71834595 13.32843506 37.02905273 13.81494141 C39 15 39 15 39.84375 16.9699707 C40.49342913 25.41072381 30.94776473 35.75864029 26 42 C25.40703125 42.75925781 24.8140625 43.51851562 24.203125 44.30078125 C9.68750758 61.76294494 -14.28234764 74.8665569 -37 77 C-61.22105191 78.03276946 -85.35950409 76.70549321 -105 61 C-105.74378906 60.44441406 -106.48757812 59.88882813 -107.25390625 59.31640625 C-123.79829816 46.85775982 -123.79829816 46.85775982 -126 40 C-125.10539062 39.23816406 -124.21078125 38.47632813 -123.2890625 37.69140625 C-116.87637214 32.21935059 -110.50956553 26.71190714 -104.265625 21.046875 C-100.88076288 17.98882715 -97.44363278 14.99153574 -94 12 C-90.74459922 13.40639025 -88.85406513 15.05982643 -86.5 17.6875 C-77.43916873 26.95043159 -66.1810049 31.99274637 -53.34033203 32.2980957 C-46.39490631 32.33973156 -39.63170864 32.26258295 -33 30 C-32.21882813 29.75507813 -31.43765625 29.51015625 -30.6328125 29.2578125 C-17.23315198 24.54079805 -7.75035638 15.14019465 -1.25 2.6328125 C-0.8375 1.76398438 -0.425 0.89515625 0 0 Z " fill="#021A71" transform="translate(213,119)"/>
+<path d="M0 0 C5.35552828 3.39157167 9.73048255 7.37353935 14.31640625 11.7578125 C16.86387172 13.88626254 18.8665855 14.9914145 22 16 C22.95261719 15.09636719 23.90523437 14.19273438 24.88671875 13.26171875 C26.15342443 12.07007711 27.42036387 10.87868391 28.6875 9.6875 C29.31333984 9.09259766 29.93917969 8.49769531 30.58398438 7.88476562 C33.87475275 4.80074709 36.98137595 2.12841083 41 0 C41.66644531 0.61746094 42.33289063 1.23492187 43.01953125 1.87109375 C48.7281423 7.11662866 54.5269502 12.15258764 60.58984375 16.9921875 C66.81970816 22.18205834 66.81970816 22.18205834 67.53125 25.41015625 C67.38452482 37.86345569 62.48204938 48.68984739 54.2265625 58 C46.31381371 65.47871616 35.90872336 71.06835437 25 72 C24.06671875 72.08121094 23.1334375 72.16242188 22.171875 72.24609375 C8.50219507 72.83653804 -2.2982359 67.43653936 -13.1875 59.75 C-21.40487698 51.71523139 -27.73929647 40.75799942 -28.75 29.125 C-28.43874508 24.7355076 -26.48070743 22.6315565 -23.25 19.8046875 C-22.5075 19.20914063 -21.765 18.61359375 -21 18 C-20.154375 17.30132812 -19.30875 16.60265625 -18.4375 15.8828125 C-16.58822798 14.36451814 -14.73128441 12.85552457 -12.8671875 11.35546875 C-8.44244171 7.72042555 -4.21848422 3.87075667 0 0 Z " fill="#031A71" transform="translate(144,75)"/>
+<path d="M0 0 C0.89460938 0.43441406 1.78921875 0.86882813 2.7109375 1.31640625 C13.56733148 7.178859 20.58301944 16.62066024 25 28 C26.34950368 32.74608059 27 37.065874 27 42 C23.55220914 40.49993609 21.17639467 38.49590738 18.4375 35.9375 C12.27265981 30.28487205 5.96967741 24.64645161 -1 20 C-1.6290625 20.56847656 -2.258125 21.13695313 -2.90625 21.72265625 C-8.23211968 26.5271682 -13.58511587 31.29600848 -19 36 C-23.98743064 34.50843196 -26.93142754 31.54332502 -30.5625 28 C-35.25906082 23.26431569 -35.25906082 23.26431569 -41 20 C-41.66644531 20.61746094 -42.33289063 21.23492187 -43.01953125 21.87109375 C-49.49783882 27.82388826 -56.14900967 33.47570939 -63 39 C-65.00712736 40.65839866 -67.00426503 42.32789773 -69 44 C-69.89444705 31.15474652 -65.74873183 21.17814981 -58 11 C-42.95796817 -5.60359869 -19.74821462 -9.8220012 0 0 Z " fill="#FDD204" transform="translate(185,56)"/>
+<path d="M0 0 C4.28792054 2.72349458 7.96086865 5.64265272 11.6875 9.125 C14.40593357 11.65919672 16.90611339 13.93740893 20 16 C18.45427224 19.81628832 16.11228755 21.97025743 13.0625 24.6875 C12.57450928 25.12392822 12.08651855 25.56035645 11.58374023 26.01000977 C7.44438884 29.68168288 3.1542964 33.15674428 -1.15625 36.625 C-4.88158413 39.73626806 -8.42845194 43.02239671 -11.94116211 46.37084961 C-14.47323772 48.75074994 -16.77334734 50.66509642 -20 52 C-20.96345444 50.12762629 -21.92053102 48.2519701 -22.875 46.375 C-23.40867187 45.33085938 -23.94234375 44.28671875 -24.4921875 43.2109375 C-27.26231047 37.31186734 -29.44678461 31.53349556 -28 25 C-26.12378629 22.11112789 -23.67216304 20.14329744 -21 18 C-20.154375 17.30132812 -19.30875 16.60265625 -18.4375 15.8828125 C-16.58822798 14.36451814 -14.73128441 12.85552457 -12.8671875 11.35546875 C-8.44244171 7.72042555 -4.21848422 3.87075667 0 0 Z " fill="#7A853B" transform="translate(144,75)"/>
+<path d="M0 0 C0.30292969 1.05058594 0.60585937 2.10117188 0.91796875 3.18359375 C3.21554955 10.95006406 5.53141385 18.15450633 10 25 C9.34515625 25.52207031 8.6903125 26.04414063 8.015625 26.58203125 C2.85533541 30.74379023 -2.14926847 34.98462376 -7 39.5 C-12.46969905 44.59155144 -18.15506859 49.34016295 -24 54 C-27.98232778 50.33096724 -30.64316353 46.66489768 -33.25 41.9375 C-33.600625 41.32583984 -33.95125 40.71417969 -34.3125 40.08398438 C-35.98121521 37.11559674 -37.4271484 34.37813958 -38 31 C-31.44231174 24.87720206 -24.8192745 18.95918641 -17.8125 13.34765625 C-14.05017212 10.20715756 -10.48696844 6.86610283 -6.97070312 3.453125 C-3.32463848 0 -3.32463848 0 0 0 Z " fill="#6D3C5E" transform="translate(111,106)"/>
+<path d="M0 0 C5.83043424 4.10970437 11.09789229 8.68615219 16.30078125 13.5625 C18.89058893 15.98553895 18.89058893 15.98553895 21.48046875 17.8125 C24.59352223 20.10458893 26.65980595 21.65401484 27.62890625 25.48828125 C28.05445689 35.19358123 24.02478887 43.92444646 19 52 C18.071875 51.0409375 18.071875 51.0409375 17.125 50.0625 C11.25501774 44.20900645 5.00673282 38.77135771 -1.4375 33.5625 C-7.88257776 28.34767925 -14.13523865 22.86476135 -20 17 C-19.31035156 16.443125 -18.62070313 15.88625 -17.91015625 15.3125 C-11.80242122 10.35258349 -5.83030237 5.28326166 0 0 Z " fill="#35647D" transform="translate(184,75)"/>
+<path d="M0 0 C0.66 0.33 1.32 0.66 2 1 C-1.63 4.63 -5.26 8.26 -9 12 C-9.66 11.67 -10.32 11.34 -11 11 C-9.92173635 9.72486237 -8.83714481 8.45507431 -7.75 7.1875 C-7.14671875 6.47980469 -6.5434375 5.77210937 -5.921875 5.04296875 C-4.07629602 3.08110329 -2.20054668 1.54330375 0 0 Z " fill="#FEDE22" transform="translate(135,60)"/>
+<path d="M0 0 C3.75931429 1.03381143 5.16972619 2.16972619 8 5 C4.37 4.01 0.74 3.02 -3 2 C-2.01 1.34 -1.02 0.68 0 0 Z " fill="#45755B" transform="translate(109,181)"/>
+<path d="M0 0 C0.33 0.66 0.66 1.32 1 2 C6.445 1.505 6.445 1.505 12 1 C12 1.33 12 1.66 12 2 C7.71 2.66 3.42 3.32 -1 4 C-0.67 2.68 -0.34 1.36 0 0 Z " fill="#4F7F60" transform="translate(24,65)"/>
+</svg>
--- a/mobile/apps/auth/assets/custom-icons/icons/emeritihealth.svg
+++ b/mobile/apps/auth/assets/custom-icons/icons/emeritihealth.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="121" height="111">
+<path d="M0 0 C39.93 0 79.86 0 121 0 C121 36.63 121 73.26 121 111 C81.07 111 41.14 111 0 111 C0 74.37 0 37.74 0 0 Z " fill="#FDFDFC" transform="translate(0,0)"/>
+<path d="M0 0 C1.34094727 -0.00483398 1.34094727 -0.00483398 2.70898438 -0.00976562 C15.92329958 0.09656756 29.05768111 5.15920937 38.69921875 14.3671875 C46.33623486 22.91378081 51.45414229 32.03867724 53.4375 43.3125 C55.4175 42.9825 57.3975 42.6525 59.4375 42.3125 C56.40996635 50.06943534 46.82853593 55.97682128 39.5 59.3125 C37.82136046 60.00117263 36.13406518 60.66925254 34.4375 61.3125 C33.5609375 61.67085937 32.684375 62.02921875 31.78125 62.3984375 C20.17960201 66.92308022 6.59150797 64.44771949 -4.48828125 59.66015625 C-6.56191878 58.74121933 -8.62982096 57.81032187 -10.69677734 56.87646484 C-21.71786864 51.93615813 -31.96757967 49.00024219 -43.6875 53.25 C-49.85297476 56.02724089 -53.58090596 59.9493408 -57.5625 65.3125 C-58.41134766 66.43978516 -58.41134766 66.43978516 -59.27734375 67.58984375 C-59.70144531 68.15832031 -60.12554687 68.72679688 -60.5625 69.3125 C-60.21265815 63.71503042 -56.42242893 59.17242893 -52.5625 55.3125 C-52.45417831 53.23031638 -52.37676459 51.14650871 -52.3125 49.0625 C-51.32728272 34.37380601 -44.38377625 22.27099897 -33.859375 12.1953125 C-23.67156706 3.84408218 -13.05318857 -0.23629958 0 0 Z " fill="#7D9C07" transform="translate(60.5625,2.6875)"/>
+<path d="M0 0 C39.93 0 79.86 0 121 0 C121 15.18 121 30.36 121 46 C118.69 46 116.38 46 114 46 C113.72027344 45.10539062 113.44054687 44.21078125 113.15234375 43.2890625 C110.46208014 35.17501984 107.34684612 28.77440212 102 22 C101.401875 21.113125 100.80375 20.22625 100.1875 19.3125 C91.26978576 9.88520209 79.12630771 4.33913818 66.27734375 3.7265625 C48.74009638 3.25612695 36.53738751 7.13555151 23.3125 19.1875 C14.84180419 28.0987521 10.10977052 38.99431955 9.6875 51.125 C9.34944073 57.79987234 7.81473954 60.61643116 3 65 C2.01 66.32 1.02 67.64 0 69 C0 46.23 0 23.46 0 0 Z " fill="#FDFEFC" transform="translate(0,0)"/>
+<path d="M0 0 C7.7514671 5.16764473 13.82626339 13.90836132 16.703125 22.71875 C16.703125 24.03875 16.703125 25.35875 16.703125 26.71875 C11.46215703 26.16706916 7.64974874 24.39540175 3.078125 21.96875 C-14.90773287 12.27142089 -14.90773287 12.27142089 -34.734375 12.4375 C-39.88111467 14.59356662 -45.70693353 17.53886707 -48.296875 22.71875 C-47.08 22.615625 -45.863125 22.5125 -44.609375 22.40625 C-34.14474874 22.43895196 -24.29281839 28.5635433 -15.1953125 33.265625 C-10.48229066 35.6284877 -6.28828923 36.00534278 -1.109375 36.28125 C0.01500977 36.34602539 0.01500977 36.34602539 1.16210938 36.41210938 C3.00890875 36.51797685 4.85599334 36.6188476 6.703125 36.71875 C3.65258646 39.76928854 0.59053342 39.47031177 -3.60205078 39.58984375 C-11.64954951 39.3417513 -18.79427187 36.1503666 -26.171875 33.21875 C-39.2911509 28.00909237 -50.24239432 25.58953741 -64.296875 28.71875 C-63.91593636 18.62387614 -58.87170481 10.32516481 -51.57421875 3.50390625 C-35.74413322 -8.9049258 -17.299832 -9.65024642 0 0 Z " fill="#FBFCF9" transform="translate(85.296875,20.28125)"/>
+<path d="M0 0 C0.07476562 0.59425781 0.14953125 1.18851563 0.2265625 1.80078125 C1.89490592 12.31788733 7.03959282 21.85443765 15 29 C18.20627298 31.27541953 21.4909817 33.22982559 25 35 C26.60294922 35.81017578 26.60294922 35.81017578 28.23828125 36.63671875 C32.50890201 38.42008659 36.60502154 38.5364421 41.1875 38.5 C42.02394043 38.49427979 42.86038086 38.48855957 43.72216797 38.48266602 C54.81538411 38.16495288 64.10602396 33.8155071 72 26 C76.47244994 20.53700746 79.32082187 14.4918547 82 8 C85.96 8 89.92 8 94 8 C91.39683113 21.53647814 84.16445962 32.6524866 73.296875 41.1015625 C60.88291389 49.43665068 45.9146679 53.47483724 31.00488281 50.61767578 C22.25796227 48.44289499 14.98853845 44.65676037 8 39 C6.948125 38.236875 5.89625 37.47375 4.8125 36.6875 C-1.36142088 30.78797561 -5.25051243 24.03047722 -8.4375 16.1875 C-8.69660156 15.55344238 -8.95570312 14.91938477 -9.22265625 14.26611328 C-10.58441341 10.72610583 -11.29621798 7.7930351 -11 4 C-4.5 0 -4.5 0 0 0 Z " fill="#7D9C08" transform="translate(20,59)"/>
+<path d="M0 0 C2.01050607 0.26263368 4.00961749 0.61336248 6 1 C8.78756093 1.25820896 11.57995448 1.40834288 14.375 1.5625 C15.11105469 1.60568359 15.84710938 1.64886719 16.60546875 1.69335938 C18.40348068 1.79843799 20.20171958 1.89962093 22 2 C19.47636907 4.52363093 17.87673704 4.2605272 14.4296875 4.2734375 C13.71039063 4.26570313 12.99109375 4.25796875 12.25 4.25 C11.54617187 4.25773437 10.84234375 4.26546875 10.1171875 4.2734375 C5.70222524 4.257025 2.15942781 3.64807517 -2 2 C-1.34 1.34 -0.68 0.68 0 0 Z " fill="#DFE7C3" transform="translate(70,55)"/>
+<path d="M0 0 C0.99 0.33 1.98 0.66 3 1 C2.60167969 1.45890625 2.20335937 1.9178125 1.79296875 2.390625 C-0.91142062 5.52271585 -3.57991771 8.63877459 -6 12 C-5.54300722 6.97307937 -3.00758252 3.85103739 0 0 Z " fill="#9DB444" transform="translate(6,60)"/>
+<path d="M0 0 C0 0.66 0 1.32 0 2 C0.66 2.33 1.32 2.66 2 3 C-4.625 2.25 -4.625 2.25 -8 0 C-5.13822943 -1.43088528 -3.06624227 -0.59991697 0 0 Z " fill="#E9EED6" transform="translate(76,56)"/>
+</svg>
--- a/mobile/apps/auth/assets/custom-icons/icons/lincolnfinancial.svg
+++ b/mobile/apps/auth/assets/custom-icons/icons/lincolnfinancial.svg
--- a/mobile/apps/auth/assets/custom-icons/icons/nasdaq.svg
+++ b/mobile/apps/auth/assets/custom-icons/icons/nasdaq.svg
@@ -0,0 +1,12 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 70.1 60" style="enable-background:new 0 0 70.1 60;" xml:space="preserve">
+ <style type="text/css">
+  .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#0090BA;}
+ </style>
+ <g>
+  <path class="st0" d="M53.3,0L37.7,43c-0.4,1.1-1.4,1.8-2.5,2v0h16.5c1.3,0,2.4-0.8,2.8-2L70.1,0H53.3z M33.9,44.3
+		c1,0,1.8-0.5,2.3-1.2c0.1-0.1,0.2-0.3,0.4-0.7l5.7-15.8l-3.3-9.2c-0.4-1-1.4-1.7-2.6-1.7c-1,0-1.8,0.5-2.3,1.2
+		c-0.1,0.1-0.3,0.4-0.4,0.7l-5.7,15.8l3.4,9.2C31.7,43.6,32.7,44.3,33.9,44.3z M18.4,15h16.7v0c-1.2,0.1-2.3,0.9-2.7,2L16.8,60H0
+		l15.6-43C16,15.9,17.1,15,18.4,15z">
+  </path>
+ </g>
+</svg>
--- a/mobile/apps/auth/assets/custom-icons/icons/numerai.svg
+++ b/mobile/apps/auth/assets/custom-icons/icons/numerai.svg
--- a/mobile/apps/auth/assets/custom-icons/icons/pangolin.svg
+++ b/mobile/apps/auth/assets/custom-icons/icons/pangolin.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="900.82861"
+   height="955.20648"
+   viewBox="0 0 238.34422 252.7317"
+   version="1.1"
+   id="svg420"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs417" />
+  <g
+     id="layer1"
+     transform="translate(-13.119542,-5.9258171)">
+    <path
+       d="m 213.66176,90.072122 c 4.95655,0 8.97383,4.018046 8.97383,8.973827 0,4.956581 -4.01728,8.974621 -8.97383,8.974621 -4.95657,0 -8.97462,-4.01804 -8.97462,-8.974621 0,-4.955781 4.01805,-8.973827 8.97462,-8.973827 z m 35.2316,37.450998 c -0.90048,29.80928 -23.66033,69.21262 -54.51292,79.34466 -36.04206,11.836 -63.40991,-5.92226 -72.08409,-26.74061 -6.75754,-16.21966 -1.65117,-35.62363 10.96266,-43.83669 10.6506,-6.93533 30.48543,-8.76736 47.15454,2.19144 -5.85627,-15.34246 -21.62491,-25.4256 -35.59101,-28.49424 -13.96613,-3.06867 -28.38324,0.43858 -38.74504,5.69946 13.29071,-14.68572 44.40801,-28.946049 78.24077,-10.95958 22.67676,12.05491 32.43775,28.93208 42.0489,51.72763 C 251.59637,117.87858 234.026,71.411066 203.39074,43.794029 172.15544,15.636686 129.95516,4.340214 97.668803,6.103155 108.32483,12.678273 120.84625,22.06586 132.41209,33.053363 81.298533,26.697169 39.174705,38.314245 13.119542,73.749217 27.67508,70.878527 46.868833,69.073666 65.974711,70.016861 28.737658,96.252107 7.1124298,140.38147 18.105298,186.43137 c 6.718497,-11.74129 16.767711,-25.84558 28.726275,-38.62863 -3.677175,34.36994 1.42836,80.83745 45.62293,110.85478 -2.25587,-9.42394 -4.08014,-20.88443 -4.91466,-33.0154 20.673197,16.1282 50.685067,29.42205 87.917917,20.24096 65.77679,-16.21975 83.34719,-79.78335 73.4356,-118.35996"
+       style="fill:#f36118;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0776283"
+       id="path32" />
+  </g>
+</svg>
--- a/mobile/apps/auth/assets/custom-icons/icons/startmail.svg
+++ b/mobile/apps/auth/assets/custom-icons/icons/startmail.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="500px" height="500px" viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#6573FF;}
+	.st1{fill:#202945;}
+</style>
+<g>
+	<path class="st0" d="M500,47.2C500,20.9,478.6,0,452.9,0H47.7C21.4-0.5,0,20.9,0,47.2v43.9c0,0,186.4,180.6,250.5,180.6
+		C319.6,271.7,500,92.2,500,92.2S500,56.5,500,47.2z"/>
+	<path class="st1" d="M0,452.8C0,479.1,21.4,500,47.2,500h405.6c26.3,0,47.2-21.4,47.2-47.2V142.7c0,0-159.2,184.4-249.7,184.4
+		C160.8,327.1,0,178.4,0,178.4C0,236.6,0,395.2,0,452.8z"/>
+</g>
+</svg>
--- a/mobile/apps/auth/assets/custom-icons/icons/unitedhealthgroup.svg
+++ b/mobile/apps/auth/assets/custom-icons/icons/unitedhealthgroup.svg
--- a/mobile/apps/auth/ios/Flutter/ephemeral/flutter_lldb_helper.py
+++ b/mobile/apps/auth/ios/Flutter/ephemeral/flutter_lldb_helper.py
@@ -1,32 +0,0 @@
-#
-# Generated file, do not edit.
-#
-
-import lldb
-
-def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
-    """Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
-    base = frame.register["x0"].GetValueAsAddress()
-    page_len = frame.register["x1"].GetValueAsUnsigned()
-
-    # Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
-    # first page to see if handled it correctly. This makes diagnosing
-    # misconfiguration (e.g. missing breakpoint) easier.
-    data = bytearray(page_len)
-    data[0:8] = b'IHELPED!'
-
-    error = lldb.SBError()
-    frame.GetThread().GetProcess().WriteMemory(base, data, error)
-    if not error.Success():
-        print(f'Failed to write into {base}[+{page_len}]', error)
-        return
-
-def __lldb_init_module(debugger: lldb.SBDebugger, _):
-    target = debugger.GetDummyTarget()
-    # Caveat: must use BreakpointCreateByRegEx here and not
-    # BreakpointCreateByName. For some reasons callback function does not
-    # get carried over from dummy target for the later.
-    bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
-    bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
-    bp.SetAutoContinue(True)
-    print("-- LLDB integration loaded --")
--- a/mobile/apps/auth/ios/Flutter/ephemeral/flutter_lldbinit
+++ b/mobile/apps/auth/ios/Flutter/ephemeral/flutter_lldbinit
@@ -1,5 +0,0 @@
-#
-# Generated file, do not edit.
-#
-
-command script import --relative-to-command-file flutter_lldb_helper.py
--- a/mobile/apps/auth/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/mobile/apps/auth/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -26,7 +26,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
      shouldUseLaunchSchemeArgsEnv = "YES">
      <MacroExpansion>
         <BuildableReference
@@ -44,13 +43,11 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      debugServiceExtension = "internal"
-      enableGPUValidationMode = "1"
      allowLocationSimulation = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
--- a/mobile/apps/auth/lib/app/view/app.dart
+++ b/mobile/apps/auth/lib/app/view/app.dart
@@ -40,7 +40,7 @@ class _AppState extends State<App>
  late StreamSubscription<SignedOutEvent> _signedOutEvent;
  late StreamSubscription<SignedInEvent> _signedInEvent;
  Locale? locale;
-  void setLocale(Locale newLocale) {
+  setLocale(Locale newLocale) {
    setState(() {
      locale = newLocale;
    });
@@ -82,7 +82,7 @@ class _AppState extends State<App>
                UpdateService.instance.getLatestVersionInfo(),
              );
            },
-            barrierColor: Colors.black.withValues(alpha: 0.85),
+            barrierColor: Colors.black.withOpacity(0.85),
          );
        });
      }
--- a/mobile/apps/auth/lib/bootstrap.dart
+++ b/mobile/apps/auth/lib/bootstrap.dart
@@ -27,8 +27,10 @@ Future<void> bootstrap(FutureOr<Widget> Function() builder) async {

  await runZonedGuarded(
    () async {
-      Bloc.observer = AppBlocObserver();
-      runApp(await builder());
+      await BlocOverrides.runZoned(
+        () async => runApp(await builder()),
+        blocObserver: AppBlocObserver(),
+      );
    },
    (error, stackTrace) => log(error.toString(), stackTrace: stackTrace),
  );
--- a/mobile/apps/auth/lib/ente_theme_data.dart
+++ b/mobile/apps/auth/lib/ente_theme_data.dart
@@ -39,7 +39,7 @@ final lightThemeData = ThemeData(
    bodyLarge: const TextStyle(color: Colors.orange),
  ),
  cardColor: const Color.fromRGBO(250, 250, 250, 1.0),
-  dialogTheme: const DialogThemeData().copyWith(
+  dialogTheme: const DialogTheme().copyWith(
    backgroundColor: const Color.fromRGBO(250, 250, 250, 1.0), //
    titleTextStyle: const TextStyle(
      color: Colors.black,
@@ -150,7 +150,7 @@ final darkThemeData = ThemeData(
    elevation: 0,
  ),
  cardColor: const Color.fromRGBO(10, 15, 15, 1.0),
-  dialogTheme: const DialogThemeData().copyWith(
+  dialogTheme: const DialogTheme().copyWith(
    backgroundColor: const Color.fromRGBO(15, 15, 15, 1.0),
    titleTextStyle: const TextStyle(
      color: Colors.white,
@@ -275,7 +275,7 @@ TextTheme _buildTextTheme(Color textColor) {
      fontWeight: FontWeight.w500,
    ),
    bodySmall: TextStyle(
-      color: textColor.withValues(alpha: 0.4),
+      color: textColor.withOpacity(0.4),
      fontSize: 10,
      fontWeight: FontWeight.w500,
    ),
@@ -343,7 +343,7 @@ extension CustomColorScheme on ColorScheme {
      : const Color.fromRGBO(48, 48, 48, 0.5);

  Color get iconColor => brightness == Brightness.light
-      ? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.75)
+      ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.75)
      : const Color.fromRGBO(255, 255, 255, 1);

  Color get bgColorForQuestions => brightness == Brightness.light
@@ -354,7 +354,7 @@ extension CustomColorScheme on ColorScheme {

  Color get cupertinoPickerTopColor => brightness == Brightness.light
      ? const Color.fromARGB(255, 238, 238, 238)
-      : const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.1);
+      : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.1);

  Color get stepProgressUnselectedColor => brightness == Brightness.light
      ? const Color.fromRGBO(196, 196, 196, 0.6)
@@ -381,20 +381,20 @@ extension CustomColorScheme on ColorScheme {
      : const Color.fromRGBO(20, 20, 20, 1);

  Color get galleryThumbDrawColor => brightness == Brightness.light
-      ? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.8)
-      : const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.5);
+      ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.8)
+      : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.5);

  Color get backupEnabledBgColor => brightness == Brightness.light
      ? const Color.fromRGBO(230, 230, 230, 0.95)
      : const Color.fromRGBO(10, 40, 40, 0.3);

  Color get dotsIndicatorActiveColor => brightness == Brightness.light
-      ? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.5)
-      : const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.5);
+      ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.5)
+      : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.5);

  Color get dotsIndicatorInactiveColor => brightness == Brightness.light
-      ? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.12)
-      : const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.12);
+      ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.12)
+      : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.12);

  Color get toastTextColor => brightness == Brightness.light
      ? const Color.fromRGBO(255, 255, 255, 1)
@@ -409,8 +409,8 @@ extension CustomColorScheme on ColorScheme {
      : const Color.fromRGBO(100, 100, 100, 1);

  Color get themeSwitchInactiveIconColor => brightness == Brightness.light
-      ? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.5)
-      : const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.5);
+      ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.5)
+      : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.5);

  Color get searchResultsColor => brightness == Brightness.light
      ? const Color.fromRGBO(245, 245, 245, 1.0)
@@ -421,8 +421,8 @@ extension CustomColorScheme on ColorScheme {
      : const Color.fromRGBO(150, 150, 150, 1);

  Color get searchResultsBackgroundColor => brightness == Brightness.light
-      ? Colors.black.withValues(alpha: 0.32)
-      : Colors.black.withValues(alpha: 0.64);
+      ? Colors.black.withOpacity(0.32)
+      : Colors.black.withOpacity(0.64);

  Color get codeCardBackgroundColor => brightness == Brightness.light
      ? const Color.fromRGBO(246, 246, 246, 1)
--- a/mobile/apps/auth/lib/l10n/l10n.dart
+++ b/mobile/apps/auth/lib/l10n/l10n.dart
@@ -1,8 +1,7 @@
-import "package:ente_auth/l10n/arb/app_localizations.dart"
-    show AppLocalizations;
 import "package:flutter/widgets.dart";
-export "package:ente_auth/l10n/arb/app_localizations.dart"
-    show AppLocalizations;
+import "package:flutter_gen/gen_l10n/app_localizations.dart";
+
+export "package:flutter_gen/gen_l10n/app_localizations.dart";

 extension AppLocalizationsX on BuildContext {
  AppLocalizations get l10n => AppLocalizations.of(this);
--- a/mobile/apps/auth/lib/models/billing_plan.dart
+++ b/mobile/apps/auth/lib/models/billing_plan.dart
@@ -2,7 +2,7 @@ import 'dart:convert';

 class BillingPlans {
  final List<BillingPlan> plans;
-  final FreePlan? freePlan;
+  final FreePlan freePlan;

  BillingPlans({
    required this.plans,
@@ -12,12 +12,12 @@ class BillingPlans {
  Map<String, dynamic> toMap() {
    return {
      'plans': plans.map((x) => x.toMap()).toList(),
-      'freePlan': freePlan?.toMap(),
+      'freePlan': freePlan.toMap(),
    };
  }

-  static BillingPlans fromMap(Map<String, dynamic>? map) {
-    if (map == null) return BillingPlans(plans: [], freePlan: null);
+  static fromMap(Map<String, dynamic>? map) {
+    if (map == null) return null;

    return BillingPlans(
      plans: List<BillingPlan>.from(
@@ -49,7 +49,7 @@ class FreePlan {
    };
  }

-  static FreePlan? fromMap(Map<String, dynamic>? map) {
+  static fromMap(Map<String, dynamic>? map) {
    if (map == null) return null;

    return FreePlan(
@@ -91,7 +91,7 @@ class BillingPlan {
    };
  }

-  static BillingPlan? fromMap(Map<String, dynamic>? map) {
+  static fromMap(Map<String, dynamic>? map) {
    if (map == null) return null;

    return BillingPlan(
--- a/mobile/apps/auth/lib/onboarding/view/setup_enter_secret_key_page.dart
+++ b/mobile/apps/auth/lib/onboarding/view/setup_enter_secret_key_page.dart
@@ -332,7 +332,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                                },
                              );
                            },
-                            barrierColor: Colors.black.withValues(alpha: 0.85),
+                            barrierColor: Colors.black.withOpacity(0.85),
                            barrierDismissible: false,
                          );
                        },
--- a/mobile/apps/auth/lib/store/code_display_store.dart
+++ b/mobile/apps/auth/lib/store/code_display_store.dart
@@ -75,7 +75,7 @@ class CodeDisplayStore {
      builder: (BuildContext context) {
        return EditTagDialog(tag: tag);
      },
-      barrierColor: Colors.black.withValues(alpha: 0.85),
+      barrierColor: Colors.black.withOpacity(0.85),
      barrierDismissible: false,
    );
  }
--- a/mobile/apps/auth/lib/ui/account/recovery_key_page.dart
+++ b/mobile/apps/auth/lib/ui/account/recovery_key_page.dart
@@ -147,13 +147,12 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
                          ),
                        ),
                        child: DottedBorder(
-                          options: const RoundedRectDottedBorderOptions(
-                            padding: EdgeInsets.zero,
-                            strokeWidth: 1,
-                            color: Color(0xFF6B6B6B),
-                            dashPattern: [6, 6],
-                            radius: Radius.circular(8),
-                          ),
+                          padding: EdgeInsets.zero,
+                          borderType: BorderType.RRect,
+                          strokeWidth: 1,
+                          color: const Color(0xFF6B6B6B),
+                          dashPattern: const [6, 6],
+                          radius: const Radius.circular(8),
                          child: SizedBox(
                            width: double.infinity,
                            child: Stack(
@@ -315,13 +314,7 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
      await _recoveryKeyFile.delete();
    }
    _recoveryKeyFile.writeAsStringSync(recoveryKey);
-    await SharePlus.instance.share(
-      ShareParams(
-        files: [
-          XFile(_recoveryKeyFile.path),
-        ],
-      ),
-    );
+    await Share.shareXFiles([XFile(_recoveryKeyFile.path)]);
    Future.delayed(const Duration(milliseconds: 500), () {
      if (mounted) {
        setState(() {
--- a/mobile/apps/auth/lib/ui/account/sessions_page.dart
+++ b/mobile/apps/auth/lib/ui/account/sessions_page.dart
@@ -82,7 +82,7 @@ class _SessionsPageState extends State<SessionsPage> {
                          color: Theme.of(context)
                              .colorScheme
                              .onSurface
-                              .withValues(alpha: 0.8),
+                              .withOpacity(0.8),
                          fontSize: 14,
                        ),
                      ),
@@ -95,7 +95,7 @@ class _SessionsPageState extends State<SessionsPage> {
                          color: Theme.of(context)
                              .colorScheme
                              .onSurface
-                              .withValues(alpha: 0.8),
+                              .withOpacity(0.8),
                          fontSize: 12,
                        ),
                      ),
--- a/mobile/apps/auth/lib/ui/components/banner_widget.dart
+++ b/mobile/apps/auth/lib/ui/components/banner_widget.dart
@@ -54,12 +54,12 @@ class BannerWidget extends StatelessWidget {
        dashColor = const Color.fromRGBO(255, 191, 12, 1);
        boxShadow = [
          BoxShadow(
-            color: const Color(0xFFFDB816).withValues(alpha: 0.1),
+            color: const Color(0xFFFDB816).withOpacity(0.1),
            blurRadius: 50,
            spreadRadius: 80,
          ),
          BoxShadow(
-            color: const Color(0xFFFDB816).withValues(alpha: 0.2),
+            color: const Color(0xFFFDB816).withOpacity(0.2),
            blurRadius: 25,
          ),
        ];
@@ -71,13 +71,12 @@ class BannerWidget extends StatelessWidget {
        dashColor = const Color.fromRGBO(233, 233, 233, 1);
        boxShadow = [
          BoxShadow(
-            color: const Color.fromRGBO(78, 78, 78, 1).withValues(alpha: 0.2),
+            color: const Color.fromRGBO(78, 78, 78, 1).withOpacity(0.2),
            blurRadius: 50,
            spreadRadius: 100,
          ),
          BoxShadow(
-            color:
-                const Color.fromRGBO(23, 22, 22, 0.30).withValues(alpha: 0.1),
+            color: const Color.fromRGBO(23, 22, 22, 0.30).withOpacity(0.1),
            blurRadius: 25,
          ),
        ];
@@ -88,12 +87,12 @@ class BannerWidget extends StatelessWidget {
        dashColor = const Color.fromRGBO(29, 185, 84, 1);
        boxShadow = [
          BoxShadow(
-            color: const Color.fromRGBO(38, 203, 95, 1).withValues(alpha: 0.08),
+            color: const Color.fromRGBO(38, 203, 95, 1).withOpacity(0.08),
            blurRadius: 50,
            spreadRadius: 100,
          ),
          BoxShadow(
-            color: const Color.fromRGBO(0, 0, 0, 0.50).withValues(alpha: 0.08),
+            color: const Color.fromRGBO(0, 0, 0, 0.50).withOpacity(0.08),
            blurRadius: 25,
          ),
        ];
@@ -104,12 +103,12 @@ class BannerWidget extends StatelessWidget {
        imagePath = "assets/discount.png";
        boxShadow = [
          BoxShadow(
-            color: const Color.fromRGBO(38, 203, 95, 1).withValues(alpha: 0.08),
+            color: const Color.fromRGBO(38, 203, 95, 1).withOpacity(0.08),
            blurRadius: 50,
            spreadRadius: 100,
          ),
          BoxShadow(
-            color: const Color.fromRGBO(0, 0, 0, 0.50).withValues(alpha: 0.08),
+            color: const Color.fromRGBO(0, 0, 0, 0.50).withOpacity(0.08),
            blurRadius: 25,
          ),
        ];
@@ -122,11 +121,10 @@ class BannerWidget extends StatelessWidget {
      child: ClipRRect(
        borderRadius: const BorderRadius.all(Radius.circular(50)),
        child: DottedBorder(
-          options: RoundedRectDottedBorderOptions(
-            radius: const Radius.circular(50),
-            dashPattern: <double>[3, 3],
-            color: dashColor,
-          ),
+          borderType: BorderType.RRect,
+          radius: const Radius.circular(50),
+          dashPattern: const <double>[3, 3],
+          color: dashColor,
          child: Stack(
            children: [
              if (BannerType.starUs == type)
--- a/mobile/apps/auth/lib/ui/components/custom_icon_widget.dart
+++ b/mobile/apps/auth/lib/ui/components/custom_icon_widget.dart
@@ -28,7 +28,7 @@ class CustomIconWidget extends StatelessWidget {
                  width: 1.5,
                  color: getEnteColorScheme(context)
                      .tagChipSelectedColor
-                      .withValues(alpha: 0.5),
+                      .withOpacity(0.5),
                ),
                borderRadius: SmoothBorderRadius(
                  cornerRadius: 15.5,
@@ -102,7 +102,7 @@ class CustomIconWidget extends StatelessWidget {
          child: Icon(
            Icons.edit,
            size: 16,
-            color: Colors.black.withValues(alpha: 0.9),
+            color: Colors.black.withOpacity(0.9),
          ),
        ),
      ),
--- a/mobile/apps/auth/lib/ui/components/notification_warning_widget.dart
+++ b/mobile/apps/auth/lib/ui/components/notification_warning_widget.dart
@@ -52,7 +52,7 @@ class NotificationWidget extends StatelessWidget {
        subTextStyle = textTheme.miniMuted;
        strokeColorScheme = colorScheme;
        boxShadow = [
-          BoxShadow(color: Colors.black.withValues(alpha: 0.25), blurRadius: 1),
+          BoxShadow(color: Colors.black.withOpacity(0.25), blurRadius: 1),
        ];
        break;

--- a/mobile/apps/auth/lib/ui/components/title_bar_widget.dart
+++ b/mobile/apps/auth/lib/ui/components/title_bar_widget.dart
@@ -123,7 +123,7 @@ class TitleBarWidget extends StatelessWidget {
    );
  }

-  List<Widget> _actionsWithPaddingInBetween() {
+  _actionsWithPaddingInBetween() {
    if (actionIcons == null) {
      return <Widget>[const SizedBox.shrink()];
    }
@@ -135,7 +135,7 @@ class TitleBarWidget extends StatelessWidget {
      return <Widget>[const SizedBox.shrink()];
    }
    if (length == 1) {
-      return actionIcons!;
+      return actionIcons;
    }
    while (index < length) {
      if (!addWhiteSpace) {
--- a/mobile/apps/auth/lib/ui/components/toggle_switch_widget.dart
+++ b/mobile/apps/auth/lib/ui/components/toggle_switch_widget.dart
@@ -1,7 +1,6 @@
 import 'package:ente_auth/ente_theme_data.dart';
 import 'package:ente_auth/models/execution_states.dart';
 import 'package:ente_auth/models/typedefs.dart';
-import 'package:ente_auth/theme/colors.dart';
 import 'package:ente_auth/ui/common/loading_widget.dart';
 import 'package:ente_auth/utils/debouncer.dart';
 import 'package:flutter/material.dart';
@@ -105,7 +104,7 @@ class _ToggleSwitchWidgetState extends State<ToggleSwitchWidget> {
    );
  }

-  Widget _stateIcon(EnteColorScheme enteColorScheme) {
+  Widget _stateIcon(enteColorScheme) {
    if (executionState == ExecutionState.idle) {
      return const SizedBox(width: 24);
    } else if (executionState == ExecutionState.inProgress) {
--- a/mobile/apps/auth/lib/ui/home/coach_mark_widget.dart
+++ b/mobile/apps/auth/lib/ui/home/coach_mark_widget.dart
@@ -23,8 +23,7 @@ class CoachMarkWidget extends StatelessWidget {
          Expanded(
            child: Container(
              width: double.infinity,
-              color:
-                  Theme.of(context).colorScheme.surface.withValues(alpha: 0.1),
+              color: Theme.of(context).colorScheme.surface.withOpacity(0.1),
              child: BackdropFilter(
                filter: ImageFilter.blur(sigmaX: 8, sigmaY: 8),
                child: Row(
--- a/mobile/apps/auth/lib/ui/settings/about_section_widget.dart
+++ b/mobile/apps/auth/lib/ui/settings/about_section_widget.dart
@@ -77,7 +77,7 @@ class AboutSectionWidget extends StatelessWidget {
                              UpdateService.instance.getLatestVersionInfo(),
                            );
                          },
-                          barrierColor: Colors.black.withValues(alpha: 0.85),
+                          barrierColor: Colors.black.withOpacity(0.85),
                        );
                      } else {
                        showShortToast(
--- a/mobile/apps/auth/lib/ui/settings/account_section_widget.dart
+++ b/mobile/apps/auth/lib/ui/settings/account_section_widget.dart
@@ -56,7 +56,7 @@ class AccountSectionWidget extends StatelessWidget {
              builder: (BuildContext context) {
                return const ChangeEmailDialog();
              },
-              barrierColor: Colors.black.withValues(alpha: 0.85),
+              barrierColor: Colors.black.withOpacity(0.85),
              barrierDismissible: false,
            );
          }
--- a/mobile/apps/auth/lib/ui/settings/data/duplicate_code_page.dart
+++ b/mobile/apps/auth/lib/ui/settings/data/duplicate_code_page.dart
@@ -83,7 +83,7 @@ class _DuplicateCodePageState extends State<DuplicateCodePage> {
                                    color: Theme.of(context)
                                        .iconTheme
                                        .color!
-                                        .withValues(alpha: 0.7),
+                                        .withOpacity(0.7),
                                  ),
                        ),
                        const Padding(padding: EdgeInsets.only(left: 4)),
--- a/mobile/apps/auth/lib/ui/settings/data/export_widget.dart
+++ b/mobile/apps/auth/lib/ui/settings/data/export_widget.dart
@@ -170,14 +170,9 @@ Future<void> _exportCodes(
        }
        codeFile.writeAsStringSync(fileContent);
        final Size size = MediaQuery.of(context).size;
-        await SharePlus.instance.share(
-          ShareParams(
-            files: <XFile>[
-              XFile(codeFile.path, mimeType: 'text/plain'),
-            ],
-            sharePositionOrigin:
-                Rect.fromLTWH(0, 0, size.width, size.height / 2),
-          ),
+        await Share.shareXFiles(
+          [XFile(codeFile.path)],
+          sharePositionOrigin: Rect.fromLTWH(0, 0, size.width, size.height / 2),
        );
        Future.delayed(const Duration(seconds: 30), () async {
          if (codeFile.existsSync()) {
--- a/mobile/apps/auth/lib/ui/settings/lock_screen/lock_screen_confirm_password.dart
+++ b/mobile/apps/auth/lib/ui/settings/lock_screen/lock_screen_confirm_password.dart
@@ -116,10 +116,10 @@ class _LockScreenConfirmPasswordState extends State<LockScreenConfirmPassword> {
                        shape: BoxShape.circle,
                        gradient: LinearGradient(
                          colors: [
-                            Colors.grey.shade500.withValues(alpha: 0.2),
-                            Colors.grey.shade50.withValues(alpha: 0.1),
-                            Colors.grey.shade400.withValues(alpha: 0.2),
-                            Colors.grey.shade300.withValues(alpha: 0.4),
+                            Colors.grey.shade500.withOpacity(0.2),
+                            Colors.grey.shade50.withOpacity(0.1),
+                            Colors.grey.shade400.withOpacity(0.2),
+                            Colors.grey.shade300.withOpacity(0.4),
                          ],
                          begin: Alignment.topCenter,
                          end: Alignment.bottomCenter,
--- a/mobile/apps/auth/lib/ui/settings/lock_screen/lock_screen_confirm_pin.dart
+++ b/mobile/apps/auth/lib/ui/settings/lock_screen/lock_screen_confirm_pin.dart
@@ -1,9 +1,7 @@
 import "dart:io";

 import "package:ente_auth/l10n/l10n.dart";
-import "package:ente_auth/theme/colors.dart";
 import "package:ente_auth/theme/ente_theme.dart";
-import "package:ente_auth/theme/text_style.dart";
 import "package:ente_auth/ui/settings/lock_screen/custom_pin_keypad.dart";
 import "package:ente_auth/utils/lock_screen_settings.dart";
 import "package:flutter/material.dart";
@@ -91,7 +89,7 @@ class _LockScreenConfirmPinState extends State<LockScreenConfirmPin> {
    );
  }

-  Widget _getBody(EnteColorScheme colorTheme, EnteTextTheme textTheme) {
+  Widget _getBody(colorTheme, textTheme) {
    return Center(
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.center,
@@ -109,10 +107,10 @@ class _LockScreenConfirmPinState extends State<LockScreenConfirmPin> {
                    shape: BoxShape.circle,
                    gradient: LinearGradient(
                      colors: [
-                        Colors.grey.shade500.withValues(alpha: 0.2),
-                        Colors.grey.shade50.withValues(alpha: 0.1),
-                        Colors.grey.shade400.withValues(alpha: 0.2),
-                        Colors.grey.shade300.withValues(alpha: 0.4),
+                        Colors.grey.shade500.withOpacity(0.2),
+                        Colors.grey.shade50.withOpacity(0.1),
+                        Colors.grey.shade400.withOpacity(0.2),
+                        Colors.grey.shade300.withOpacity(0.4),
                      ],
                      begin: Alignment.topCenter,
                      end: Alignment.bottomCenter,
--- a/mobile/apps/auth/lib/ui/settings/lock_screen/lock_screen_password.dart
+++ b/mobile/apps/auth/lib/ui/settings/lock_screen/lock_screen_password.dart
@@ -127,10 +127,10 @@ class _LockScreenPasswordState extends State<LockScreenPassword> {
                        shape: BoxShape.circle,
                        gradient: LinearGradient(
                          colors: [
-                            Colors.grey.shade500.withValues(alpha: 0.2),
-                            Colors.grey.shade50.withValues(alpha: 0.1),
-                            Colors.grey.shade400.withValues(alpha: 0.2),
-                            Colors.grey.shade300.withValues(alpha: 0.4),
+                            Colors.grey.shade500.withOpacity(0.2),
+                            Colors.grey.shade50.withOpacity(0.1),
+                            Colors.grey.shade400.withOpacity(0.2),
+                            Colors.grey.shade300.withOpacity(0.4),
                          ],
                          begin: Alignment.topCenter,
                          end: Alignment.bottomCenter,
--- a/mobile/apps/auth/lib/ui/settings/lock_screen/lock_screen_pin.dart
+++ b/mobile/apps/auth/lib/ui/settings/lock_screen/lock_screen_pin.dart
@@ -178,10 +178,10 @@ class _LockScreenPinState extends State<LockScreenPin> {
                    shape: BoxShape.circle,
                    gradient: LinearGradient(
                      colors: [
-                        Colors.grey.shade500.withValues(alpha: 0.2),
-                        Colors.grey.shade50.withValues(alpha: 0.1),
-                        Colors.grey.shade400.withValues(alpha: 0.2),
-                        Colors.grey.shade300.withValues(alpha: 0.4),
+                        Colors.grey.shade500.withOpacity(0.2),
+                        Colors.grey.shade50.withOpacity(0.1),
+                        Colors.grey.shade400.withOpacity(0.2),
+                        Colors.grey.shade300.withOpacity(0.4),
                      ],
                      begin: Alignment.topCenter,
                      end: Alignment.bottomCenter,
--- a/mobile/apps/auth/lib/ui/settings/support_section_widget.dart
+++ b/mobile/apps/auth/lib/ui/settings/support_section_widget.dart
@@ -43,7 +43,7 @@ class _SupportSectionWidgetState extends State<SupportSectionWidget> {
          trailingIconIsMuted: true,
          onTap: () async {
            try {
-              await PlatformUtil.openWebView(
+              PlatformUtil.openWebView(
                context,
                context.l10n.faq,
                "https://help.ente.io/auth/faq",
--- a/mobile/apps/auth/lib/ui/sort_option_menu.dart
+++ b/mobile/apps/auth/lib/ui/sort_option_menu.dart
@@ -35,7 +35,7 @@ class SortCodeMenuWidget extends StatelessWidget {
        text,
        style: Theme.of(context).textTheme.titleMedium!.copyWith(
              fontSize: 14,
-              color: Theme.of(context).iconTheme.color!.withValues(alpha: 0.7),
+              color: Theme.of(context).iconTheme.color!.withOpacity(0.7),
            ),
      );
    }
--- a/mobile/apps/auth/lib/ui/tools/app_lock.dart
+++ b/mobile/apps/auth/lib/ui/tools/app_lock.dart
@@ -1,9 +1,9 @@
 import 'dart:async';

-import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/locale.dart';
 import 'package:ente_auth/utils/lock_screen_settings.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';

 /// A widget which handles app lifecycle events for showing and hiding a lock screen.
 /// This should wrap around a `MyApp` widget (or equivalent).
--- a/mobile/apps/auth/lib/ui/tools/lock_screen.dart
+++ b/mobile/apps/auth/lib/ui/tools/lock_screen.dart
@@ -96,10 +96,10 @@ class _LockScreenState extends State<LockScreen> with WidgetsBindingObserver {
                          shape: BoxShape.circle,
                          gradient: LinearGradient(
                            colors: [
-                              Colors.grey.shade500.withValues(alpha: 0.2),
-                              Colors.grey.shade50.withValues(alpha: 0.1),
-                              Colors.grey.shade400.withValues(alpha: 0.2),
-                              Colors.grey.shade300.withValues(alpha: 0.4),
+                              Colors.grey.shade500.withOpacity(0.2),
+                              Colors.grey.shade50.withOpacity(0.1),
+                              Colors.grey.shade400.withOpacity(0.2),
+                              Colors.grey.shade300.withOpacity(0.4),
                            ],
                            begin: Alignment.topCenter,
                            end: Alignment.bottomCenter,
--- a/mobile/apps/auth/lib/ui/two_factor_recovery_page.dart
+++ b/mobile/apps/auth/lib/ui/two_factor_recovery_page.dart
@@ -98,9 +98,8 @@ class _TwoFactorRecoveryPageState extends State<TwoFactorRecoveryPage> {
                  style: TextStyle(
                    decoration: TextDecoration.underline,
                    fontSize: 12,
-                    color: getEnteColorScheme(context)
-                        .textBase
-                        .withValues(alpha: 0.9),
+                    color:
+                        getEnteColorScheme(context).textBase.withOpacity(0.9),
                  ),
                ),
              ),
--- a/mobile/apps/auth/lib/utils/dialog_util.dart
+++ b/mobile/apps/auth/lib/utils/dialog_util.dart
@@ -180,7 +180,7 @@ Future<ButtonResult?> showGenericErrorDialog({
              context,
              context.l10n.faq,
              "https://help.ente.io/auth/troubleshooting/windows-login",
-            ).ignore();
+            );
          },
        ),
      ButtonWidget(
--- a/mobile/apps/auth/lib/utils/directory_utils.dart
+++ b/mobile/apps/auth/lib/utils/directory_utils.dart
@@ -34,7 +34,7 @@ class DirectoryUtils {
  }

  static String migratedNamingChanges = "migrated_naming_changes.b5";
-  static Future<void> migrateNamingChanges() async {
+  static migrateNamingChanges() async {
    try {
      final sharedPrefs = await SharedPreferences.getInstance();
      if (sharedPrefs.containsKey(migratedNamingChanges)) {
@@ -57,7 +57,7 @@ class DirectoryUtils {
      Directory oldDataDir;
      Directory newDataDir = await getApplicationSupportDirectory();
      await newDataDir.create(recursive: true);
-
+      
      if (Platform.isLinux) {
        oldDataDir = Directory(
          p.join(dataHome.path, "ente_auth"),
--- a/mobile/apps/auth/lib/utils/email_util.dart
+++ b/mobile/apps/auth/lib/utils/email_util.dart
@@ -232,13 +232,9 @@ Future<void> exportLogs(
      MimeType.zip,
    );
  } else {
-    await SharePlus.instance.share(
-      ShareParams(
-        files: <XFile>[
-          XFile(zipFilePath, mimeType: 'application/zip'),
-        ],
-        sharePositionOrigin: Rect.fromLTWH(0, 0, size.width, size.height / 2),
-      ),
+    await Share.shareXFiles(
+      [XFile(zipFilePath, mimeType: 'application/zip')],
+      sharePositionOrigin: Rect.fromLTWH(0, 0, size.width, size.height / 2),
    );
  }
 }
--- a/mobile/apps/auth/lib/utils/platform_util.dart
+++ b/mobile/apps/auth/lib/utils/platform_util.dart
@@ -28,11 +28,7 @@ class PlatformUtil {
          ? cupertinoTextSelectionControls
          : desktopTextSelectionControls;

-  static Future<void> openWebView(
-    BuildContext context,
-    String title,
-    String url,
-  ) async {
+  static openWebView(BuildContext context, String title, String url) async {
    if (PlatformUtil.isDesktop()) {
      await launchUrlString(url);
      return;
--- a/mobile/apps/auth/lib/utils/share_utils.dart
+++ b/mobile/apps/auth/lib/utils/share_utils.dart
@@ -91,11 +91,9 @@ Future<ShareResult> shareText(
 }) async {
  try {
    final sharePosOrigin = _sharePosOrigin(context, key);
-    return SharePlus.instance.share(
-      ShareParams(
-        text: text,
-        sharePositionOrigin: sharePosOrigin,
-      ),
+    return Share.share(
+      text,
+      sharePositionOrigin: sharePosOrigin,
    );
  } catch (e, s) {
    Logger("ShareUtil").severe("failed to share text", e, s);
--- a/mobile/apps/auth/lib/utils/toast_util.dart
+++ b/mobile/apps/auth/lib/utils/toast_util.dart
@@ -47,6 +47,6 @@ void showToast(
  }
 }

-void showShortToast(BuildContext context, String message) {
+void showShortToast(context, String message) {
  showToast(context, message, toastLength: Toast.LENGTH_SHORT);
 }
--- a/mobile/apps/auth/lib/utils/window_protocol_handler.dart
+++ b/mobile/apps/auth/lib/utils/window_protocol_handler.dart
@@ -36,7 +36,7 @@ class WindowsProtocolHandler {
        hKey,
        txtKey,
        txtValue,
-        REG_SZ,
+        REG_VALUE_TYPE.REG_SZ,
        txtData,
        txtData.length * 2 + 2,
      );
--- a/mobile/apps/auth/linux/flutter/generated_plugin_registrant.cc
+++ b/mobile/apps/auth/linux/flutter/generated_plugin_registrant.cc
@@ -10,7 +10,7 @@
 #include <flutter_local_authentication/flutter_local_authentication_plugin.h>
 #include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 #include <gtk/gtk_plugin.h>
-#include <screen_retriever_linux/screen_retriever_linux_plugin.h>
+#include <screen_retriever/screen_retriever_plugin.h>
 #include <sentry_flutter/sentry_flutter_plugin.h>
 #include <sodium_libs/sodium_libs_plugin.h>
 #include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
@@ -31,9 +31,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
  g_autoptr(FlPluginRegistrar) gtk_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
  gtk_plugin_register_with_registrar(gtk_registrar);
-  g_autoptr(FlPluginRegistrar) screen_retriever_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
-  screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar);
+  g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
+  screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);
  g_autoptr(FlPluginRegistrar) sentry_flutter_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "SentryFlutterPlugin");
  sentry_flutter_plugin_register_with_registrar(sentry_flutter_registrar);
--- a/mobile/apps/auth/linux/flutter/generated_plugins.cmake
+++ b/mobile/apps/auth/linux/flutter/generated_plugins.cmake
@@ -7,7 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
  flutter_local_authentication
  flutter_secure_storage_linux
  gtk
-  screen_retriever_linux
+  screen_retriever
  sentry_flutter
  sodium_libs
  sqlite3_flutter_libs
--- a/mobile/apps/auth/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/mobile/apps/auth/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -8,7 +8,6 @@ import Foundation
 import app_links
 import connectivity_plus
 import device_info_plus
-import file_picker
 import file_saver
 import flutter_inappwebview_macos
 import flutter_local_authentication
@@ -17,12 +16,12 @@ import flutter_secure_storage_macos
 import local_auth_darwin
 import package_info_plus
 import path_provider_foundation
-import screen_retriever_macos
+import screen_retriever
 import sentry_flutter
 import share_plus
 import shared_preferences_foundation
 import sodium_libs
-import sqflite_darwin
+import sqflite
 import sqlite3_flutter_libs
 import tray_manager
 import url_launcher_macos
@@ -32,16 +31,15 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
-  FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
  FileSaverPlugin.register(with: registry.registrar(forPlugin: "FileSaverPlugin"))
  InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
  FlutterLocalAuthenticationPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalAuthenticationPlugin"))
  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
-  LocalAuthPlugin.register(with: registry.registrar(forPlugin: "LocalAuthPlugin"))
+  FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin"))
  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
-  ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
+  ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
  SentryFlutterPlugin.register(with: registry.registrar(forPlugin: "SentryFlutterPlugin"))
  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
--- a/mobile/apps/auth/macos/Podfile.lock
+++ b/mobile/apps/auth/macos/Podfile.lock
@@ -2,14 +2,13 @@ PODS:
  - app_links (1.0.0):
    - FlutterMacOS
  - connectivity_plus (0.0.1):
+    - Flutter
    - FlutterMacOS
  - cupertino_http (0.0.1):
    - Flutter
    - FlutterMacOS
  - device_info_plus (0.0.1):
    - FlutterMacOS
-  - file_picker (0.0.1):
-    - FlutterMacOS
  - file_saver (0.0.1):
    - FlutterMacOS
  - flutter_inappwebview_macos (0.0.1):
@@ -19,7 +18,7 @@ PODS:
    - FlutterMacOS
  - flutter_local_notifications (0.0.1):
    - FlutterMacOS
-  - flutter_secure_storage_macos (6.1.3):
+  - flutter_secure_storage_macos (6.1.1):
    - FlutterMacOS
  - FlutterMacOS (1.0.0)
  - local_auth_darwin (0.0.1):
@@ -33,7 +32,7 @@ PODS:
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - screen_retriever_macos (0.0.1):
+  - screen_retriever (0.0.1):
    - FlutterMacOS
  - Sentry/HybridSDK (8.46.0)
  - sentry_flutter (8.14.2):
@@ -47,44 +46,39 @@ PODS:
    - FlutterMacOS
  - sodium_libs (2.2.1):
    - FlutterMacOS
-  - sqflite_darwin (0.0.4):
+  - sqflite (0.0.3):
    - Flutter
    - FlutterMacOS
-  - sqlite3 (3.50.1):
-    - sqlite3/common (= 3.50.1)
-  - sqlite3/common (3.50.1)
-  - sqlite3/dbstatvtab (3.50.1):
+  - "sqlite3 (3.46.1+1)":
+    - "sqlite3/common (= 3.46.1+1)"
+  - "sqlite3/common (3.46.1+1)"
+  - "sqlite3/dbstatvtab (3.46.1+1)":
    - sqlite3/common
-  - sqlite3/fts5 (3.50.1):
+  - "sqlite3/fts5 (3.46.1+1)":
    - sqlite3/common
-  - sqlite3/math (3.50.1):
+  - "sqlite3/perf-threadsafe (3.46.1+1)":
    - sqlite3/common
-  - sqlite3/perf-threadsafe (3.50.1):
-    - sqlite3/common
-  - sqlite3/rtree (3.50.1):
+  - "sqlite3/rtree (3.46.1+1)":
    - sqlite3/common
  - sqlite3_flutter_libs (0.0.1):
-    - Flutter
    - FlutterMacOS
-    - sqlite3 (~> 3.50.1)
+    - "sqlite3 (~> 3.46.0+1)"
    - sqlite3/dbstatvtab
    - sqlite3/fts5
-    - sqlite3/math
    - sqlite3/perf-threadsafe
    - sqlite3/rtree
  - tray_manager (0.0.1):
    - FlutterMacOS
  - url_launcher_macos (0.0.1):
    - FlutterMacOS
-  - window_manager (0.5.0):
+  - window_manager (0.2.0):
    - FlutterMacOS

 DEPENDENCIES:
  - app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`)
-  - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
+  - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/darwin`)
  - cupertino_http (from `Flutter/ephemeral/.symlinks/plugins/cupertino_http/darwin`)
  - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
-  - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
  - file_saver (from `Flutter/ephemeral/.symlinks/plugins/file_saver/macos`)
  - flutter_inappwebview_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos`)
  - flutter_local_authentication (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_authentication/macos`)
@@ -95,13 +89,13 @@ DEPENDENCIES:
  - objective_c (from `Flutter/ephemeral/.symlinks/plugins/objective_c/macos`)
  - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
-  - screen_retriever_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos`)
+  - screen_retriever (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos`)
  - sentry_flutter (from `Flutter/ephemeral/.symlinks/plugins/sentry_flutter/macos`)
  - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`)
  - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
  - sodium_libs (from `Flutter/ephemeral/.symlinks/plugins/sodium_libs/macos`)
-  - sqflite_darwin (from `Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin`)
-  - sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin`)
+  - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/darwin`)
+  - sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos`)
  - tray_manager (from `Flutter/ephemeral/.symlinks/plugins/tray_manager/macos`)
  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
  - window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`)
@@ -116,13 +110,11 @@ EXTERNAL SOURCES:
  app_links:
    :path: Flutter/ephemeral/.symlinks/plugins/app_links/macos
  connectivity_plus:
-    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
+    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/darwin
  cupertino_http:
    :path: Flutter/ephemeral/.symlinks/plugins/cupertino_http/darwin
  device_info_plus:
    :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
-  file_picker:
-    :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
  file_saver:
    :path: Flutter/ephemeral/.symlinks/plugins/file_saver/macos
  flutter_inappwebview_macos:
@@ -143,8 +135,8 @@ EXTERNAL SOURCES:
    :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos
  path_provider_foundation:
    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
-  screen_retriever_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos
+  screen_retriever:
+    :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos
  sentry_flutter:
    :path: Flutter/ephemeral/.symlinks/plugins/sentry_flutter/macos
  share_plus:
@@ -153,10 +145,10 @@ EXTERNAL SOURCES:
    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
  sodium_libs:
    :path: Flutter/ephemeral/.symlinks/plugins/sodium_libs/macos
-  sqflite_darwin:
-    :path: Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin
+  sqflite:
+    :path: Flutter/ephemeral/.symlinks/plugins/sqflite/darwin
  sqlite3_flutter_libs:
-    :path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin
+    :path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos
  tray_manager:
    :path: Flutter/ephemeral/.symlinks/plugins/tray_manager/macos
  url_launcher_macos:
@@ -165,34 +157,33 @@ EXTERNAL SOURCES:
    :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos

 SPEC CHECKSUMS:
-  app_links: afe860c55c7ef176cea7fb630a2b7d7736de591d
-  connectivity_plus: 4adf20a405e25b42b9c9f87feff8f4b6fde18a4e
+  app_links: 9028728e32c83a0831d9db8cf91c526d16cc5468
+  connectivity_plus: 3f6c9057f4cd64198dc826edfb0542892f825343
  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
  device_info_plus: b0fafc687fb901e2af612763340f1b0d4352f8e5
-  file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
  file_saver: e35bd97de451dde55ff8c38862ed7ad0f3418d0f
  flutter_inappwebview_macos: c2d68649f9f8f1831bfcd98d73fd6256366d9d1d
  flutter_local_authentication: 2f9a2682f498abcc12d7e9729b5007a947170fdc
-  flutter_local_notifications: 13862b132e32eb858dea558a86d45d08daeacfe7
-  flutter_secure_storage_macos: 7f45e30f838cf2659862a4e4e3ee1c347c2b3b54
+  flutter_local_notifications: 453432cd6399a07d072885bc7828fb2307868856
+  flutter_secure_storage_macos: b2d62a774c23b060f0b99d0173b0b36abb4a8632
  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  local_auth_darwin: d2e8c53ef0c4f43c646462e3415432c4dab3ae19
+  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
  objective_c: ec13431e45ba099cb734eb2829a5c1cd37986cba
  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: f0052d280d17aa382b932f399edf32507174e870
+  package_info_plus: a8a591e70e87ce97ce5d21b2594f69cea9e0312f
  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f
+  screen_retriever: 4f97c103641aab8ce183fa5af3b87029df167936
  Sentry: da60d980b197a46db0b35ea12cb8f39af48d8854
  sentry_flutter: 27892878729f42701297c628eb90e7c6529f3684
-  share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc
+  share_plus: 11c7b7fa7020465584eca3ff6392c5bc1e399d6e
  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
  sodium_libs: b9459e5bfc1185349f43472e79fc5d8e526b2bda
-  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
-  sqlite3: 1d85290c3321153511f6e900ede7a1608718bbd5
-  sqlite3_flutter_libs: e7fc8c9ea2200ff3271f08f127842131746b70e2
+  sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3
+  sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
+  sqlite3_flutter_libs: 03311aede9d32fb2d24e32bebb8cd01c3b2e6239
  tray_manager: a104b5c81b578d83f3c3d0f40a997c8b10810166
  url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
-  window_manager: b729e31d38fb04905235df9ea896128991cad99e
+  window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c

 PODFILE CHECKSUM: 6ff827273ace187339fc5d3684072a26ad85c298

--- a/mobile/apps/auth/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/mobile/apps/auth/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -48,7 +48,6 @@
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      debugServiceExtension = "internal"
-      enableGPUValidationMode = "1"
      allowLocationSimulation = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
--- a/mobile/apps/auth/pubspec.lock
+++ b/mobile/apps/auth/pubspec.lock
--- a/mobile/apps/auth/pubspec.yaml
+++ b/mobile/apps/auth/pubspec.yaml
@@ -10,11 +10,11 @@ environment:
 dependencies:
  adaptive_theme: ^3.1.0 # done
  app_links: ^6.3.3
-  archive: ^4.0.7
+  archive: ^3.3.7
  auto_size_text: ^3.0.0
  base32: ^2.1.3
  bip39: ^1.0.6 #done
-  bloc: ^9.0.0
+  bloc: ^8.1.2
  clipboard: ^0.1.3
  collection: ^1.18.0 # dart
  confetti: ^0.8.0
@@ -22,7 +22,7 @@ dependencies:
  convert: ^3.1.1
  device_info_plus: ^9.1.1
  dio: ^5.8.0+1
-  dotted_border: ^3.1.0
+  dotted_border: ^2.0.0+2
  dropdown_button2: ^2.3.9
  email_validator: ^3.0.0
  ente_crypto_dart:
@@ -32,19 +32,19 @@ dependencies:
  expandable: ^5.0.1
  expansion_tile_card: ^3.0.0
  ffi: ^2.1.0
-  figma_squircle: ^0.6.3
-  file_picker: ^10.2.0
+  figma_squircle: ^0.5.3
+  file_picker: ^8.1.7
  # https://github.com/incrediblezayed/file_saver/issues/86
-  file_saver: ^0.3.0
+  file_saver: ^0.2.11
  fixnum: ^1.1.0
  fk_user_agent: ^2.1.0
  flutter:
    sdk: flutter
  flutter_animate: ^4.1.0
-  flutter_bloc: ^9.1.1
+  flutter_bloc: ^8.0.1
  flutter_context_menu: ^0.2.0
  flutter_displaymode: ^0.6.0
-  flutter_email_sender: ^7.0.0
+  flutter_email_sender: ^6.0.2
  # revert to pub.dev when merged
  # https://github.com/pichillilorenzo/flutter_inappwebview/pull/2548
  flutter_inappwebview:
@@ -57,7 +57,7 @@ dependencies:
    git:
      url: https://github.com/eaceto/flutter_local_authentication
      ref: 1ac346a04592a05fd75acccf2e01fa3c7e955d96
-  flutter_local_notifications: ^18.0.1
+  flutter_local_notifications: ^17.2.2
  flutter_localizations:
    sdk: flutter
  flutter_native_splash: ^2.2.13
@@ -87,27 +87,30 @@ dependencies:
  pinput: ^5.0.0
  pointycastle: ^3.7.3
  privacy_screen: ^0.0.6
-  protobuf: ^4.1.0
+  protobuf: ^3.0.0
  qr_code_scanner: ^1.0.1
  qr_flutter: ^4.1.0 
  sentry: ^8.14.2
  sentry_flutter: ^8.14.2
-  share_plus: ^11.0.0
+  share_plus: ^10.0.2
  shared_preferences: ^2.0.5
-  sqflite: ^2.4.2
+  sqflite:
+    git:
+      url: https://github.com/tekartik/sqflite
+      path: sqflite
  sqflite_common_ffi: ^2.3.0+4
  sqlite3: ^2.4.3
  sqlite3_flutter_libs: ^0.5.24
  steam_totp: ^0.0.1
  step_progress_indicator: ^1.0.2
  styled_text: ^8.1.0
-  tray_manager: ^0.5.0
+  tray_manager: ^0.2.1
  tuple: ^2.0.0
  url_launcher: ^6.3.1
  url_launcher_ios: ^6.3.1
  uuid: ^4.2.2
  win32: ^5.1.1
-  window_manager: ^0.5.0
+  window_manager: ^0.4.2
  xdg_directories: ^1.0.4

 dev_dependencies:
@@ -115,7 +118,7 @@ dev_dependencies:
  flutter_test:
    sdk: flutter
  json_serializable: ^6.2.0
-  lints: ^5.1.1
+  lints: ^5.0.0
  mocktail: ^1.0.3

 # The following section is specific to Flutter.
--- a/mobile/apps/auth/test/helpers/pump_app.dart
+++ b/mobile/apps/auth/test/helpers/pump_app.dart
@@ -1,4 +1,4 @@
-import "package:ente_auth/l10n/arb/app_localizations.dart";
+import "package:ente_auth/l10n/l10n.dart";
 import "package:flutter/material.dart";
 import "package:flutter_localizations/flutter_localizations.dart";
 import "package:flutter_test/flutter_test.dart";
@@ -8,6 +8,7 @@ extension PumpApp on WidgetTester {
    return pumpWidget(
      MaterialApp(
        localizationsDelegates: const [
+          AppLocalizations.delegate,
          GlobalMaterialLocalizations.delegate,
        ],
        supportedLocales: AppLocalizations.supportedLocales,
--- a/mobile/apps/auth/windows/flutter/generated_plugin_registrant.cc
+++ b/mobile/apps/auth/windows/flutter/generated_plugin_registrant.cc
@@ -13,7 +13,7 @@
 #include <flutter_local_authentication/flutter_local_authentication_plugin_c_api.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <local_auth_windows/local_auth_plugin.h>
-#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
+#include <screen_retriever/screen_retriever_plugin.h>
 #include <sentry_flutter/sentry_flutter_plugin.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <sodium_libs/sodium_libs_plugin_c_api.h>
@@ -37,8 +37,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
      registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
  LocalAuthPluginRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("LocalAuthPlugin"));
-  ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
+  ScreenRetrieverPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
  SentryFlutterPluginRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("SentryFlutterPlugin"));
  SharePlusWindowsPluginCApiRegisterWithRegistrar(
--- a/mobile/apps/auth/windows/flutter/generated_plugins.cmake
+++ b/mobile/apps/auth/windows/flutter/generated_plugins.cmake
@@ -10,7 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
  flutter_local_authentication
  flutter_secure_storage_windows
  local_auth_windows
-  screen_retriever_windows
+  screen_retriever
  sentry_flutter
  share_plus
  sodium_libs
--- a/mobile/apps/photos/.fvmrc
+++ b/mobile/apps/photos/.fvmrc
@@ -1,3 +0,0 @@
-{
-  "flutter": "3.29.3"
-}
--- a/mobile/apps/photos/.gitignore
+++ b/mobile/apps/photos/.gitignore
@@ -43,6 +43,3 @@ fastlane/report.xml

 # Android related
 android/app/build/
-
-# FVM Version Cache
-.fvm/
--- a/mobile/apps/photos/README.md
+++ b/mobile/apps/photos/README.md
@@ -46,7 +46,7 @@ You can alternatively install the build from PlayStore or F-Droid.

 ## 🧑‍💻 Building from source

-1. [Install Flutter v3.29.3](https://flutter.dev/docs/get-started/install).
+1. [Install Flutter v3.24.3](https://flutter.dev/docs/get-started/install).

 2. Pull in all submodules with `git submodule update --init --recursive`

--- a/mobile/apps/photos/android/app/build.gradle
+++ b/mobile/apps/photos/android/app/build.gradle
@@ -34,7 +34,6 @@ android {
    ndkVersion = flutter.ndkVersion

    compileOptions {
-        coreLibraryDesugaringEnabled = true
        sourceCompatibility = JavaVersion.VERSION_1_8
        targetCompatibility = JavaVersion.VERSION_1_8
    }
@@ -133,7 +132,7 @@ flutter {
    source = "../.."
 }

-dependencies {  
+dependencies {
    implementation 'io.sentry:sentry-android:2.0.0'
    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21'
    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0'
@@ -143,7 +142,7 @@ dependencies {
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'androidx.test:runner:1.1.1'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
+

    constraints {
        implementation("androidx.work:work-runtime:2.8.1") {
--- a/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/MainActivity.kt
+++ b/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/MainActivity.kt
@@ -1,5 +1,11 @@
 package io.ente.photos

 import io.flutter.embedding.android.FlutterFragmentActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugins.GeneratedPluginRegistrant

-class MainActivity : FlutterFragmentActivity() {}
+class MainActivity : FlutterFragmentActivity() {
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        GeneratedPluginRegistrant.registerWith(flutterEngine)
+    }
+}
--- a/mobile/apps/photos/android/gradle/wrapper/gradle-wrapper.properties
+++ b/mobile/apps/photos/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
--- a/mobile/apps/photos/android/settings.gradle
+++ b/mobile/apps/photos/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {

 plugins {
    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.6.0" apply false
+    id "com.android.application" version "8.1.0" apply false
    id "org.jetbrains.kotlin.android" version "2.1.10" apply false
 }

--- a/mobile/apps/photos/flutter_rust_bridge.yaml
+++ b/mobile/apps/photos/flutter_rust_bridge.yaml
@@ -0,0 +1,9 @@
+rust_input: crate::api
+rust_root: rust/
+dart_output: lib/src/rust
+
+dart_preamble: |
+  // ignore_for_file: require_trailing_commas
+
+full_dep: true
+web: false
--- a/mobile/apps/photos/integration_test/app_init_test.dart
+++ b/mobile/apps/photos/integration_test/app_init_test.dart
@@ -91,10 +91,9 @@ Future<void> dismissUpdateAppDialog(WidgetTester tester) async {
  await tester.pumpAndSettle();
 }

-
 ///Use this widget as floating action buttom in HomeWidget so that frames
-///are built and rendered continuously so that timeline trace has continuous 
-///data. Change the duraiton in `_startTimer()` to control the duraiton of 
+///are built and rendered continuously so that timeline trace has continuous
+///data. Change the duraiton in `_startTimer()` to control the duraiton of
 ///test on app init.

 // class TempWidget extends StatefulWidget {
@@ -127,4 +126,4 @@ Future<void> dismissUpdateAppDialog(WidgetTester tester) async {
 //         ? const CircularProgressIndicator()
 //         : const SizedBox.shrink();
 //   }
-// }
+// }
--- a/mobile/apps/photos/ios/.gitignore
+++ b/mobile/apps/photos/ios/.gitignore
@@ -32,5 +32,3 @@ Flutter/.last_build_id
 !default.mode2v3
 !default.pbxuser
 !default.perspectivev3
-
-Flutter/ephemeral
--- a/mobile/apps/photos/ios/Podfile
+++ b/mobile/apps/photos/ios/Podfile
@@ -1,6 +1,7 @@
-source 'https://github.com/ente-io/ffmpeg-kit-custom-repo-ios.git'
+# Uncomment this line to define a global platform for your project
 platform :ios, '13.0'

+source 'https://github.com/ente-io/ffmpeg-kit-custom-repo-ios.git'
 source 'https://cdn.cocoapods.org/'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
--- a/mobile/apps/photos/ios/Podfile.lock
+++ b/mobile/apps/photos/ios/Podfile.lock
@@ -18,37 +18,37 @@ PODS:
    - Flutter
  - file_saver (0.0.1):
    - Flutter
-  - Firebase/CoreOnly (11.15.0):
-    - FirebaseCore (~> 11.15.0)
-  - Firebase/Messaging (11.15.0):
+  - Firebase/CoreOnly (11.8.0):
+    - FirebaseCore (~> 11.8.0)
+  - Firebase/Messaging (11.8.0):
    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 11.15.0)
-  - firebase_core (3.15.1):
-    - Firebase/CoreOnly (= 11.15.0)
+    - FirebaseMessaging (~> 11.8.0)
+  - firebase_core (3.12.0):
+    - Firebase/CoreOnly (= 11.8.0)
    - Flutter
-  - firebase_messaging (15.2.9):
-    - Firebase/Messaging (= 11.15.0)
+  - firebase_messaging (15.2.3):
+    - Firebase/Messaging (= 11.8.0)
    - firebase_core
    - Flutter
-  - FirebaseCore (11.15.0):
-    - FirebaseCoreInternal (~> 11.15.0)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/Logger (~> 8.1)
-  - FirebaseCoreInternal (11.15.0):
-    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-  - FirebaseInstallations (11.15.0):
-    - FirebaseCore (~> 11.15.0)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/UserDefaults (~> 8.1)
+  - FirebaseCore (11.8.1):
+    - FirebaseCoreInternal (~> 11.8.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Logger (~> 8.0)
+  - FirebaseCoreInternal (11.8.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+  - FirebaseInstallations (11.8.0):
+    - FirebaseCore (~> 11.8.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
    - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (11.15.0):
-    - FirebaseCore (~> 11.15.0)
+  - FirebaseMessaging (11.8.0):
+    - FirebaseCore (~> 11.8.0)
    - FirebaseInstallations (~> 11.0)
    - GoogleDataTransport (~> 10.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/Reachability (~> 8.1)
-    - GoogleUtilities/UserDefaults (~> 8.1)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Reachability (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
    - nanopb (~> 3.30910.0)
  - Flutter (1.0.0)
  - flutter_email_sender (0.0.1):
@@ -127,6 +127,9 @@ PODS:
  - libwebp/sharpyuv (1.5.0)
  - libwebp/webp (1.5.0):
    - libwebp/sharpyuv
+  - local_auth_darwin (0.0.1):
+    - Flutter
+    - FlutterMacOS
  - local_auth_ios (0.0.1):
    - Flutter
  - Mantle (2.2.0):
@@ -173,7 +176,7 @@ PODS:
    - FlutterMacOS
  - permission_handler_apple (9.3.0):
    - Flutter
-  - photo_manager (3.7.1):
+  - photo_manager (2.0.0):
    - Flutter
    - FlutterMacOS
  - privacy_screen (0.0.1):
@@ -200,26 +203,23 @@ PODS:
  - sqflite_darwin (0.0.4):
    - Flutter
    - FlutterMacOS
-  - sqlite3 (3.50.1):
-    - sqlite3/common (= 3.50.1)
-  - sqlite3/common (3.50.1)
-  - sqlite3/dbstatvtab (3.50.1):
+  - sqlite3 (3.49.2):
+    - sqlite3/common (= 3.49.2)
+  - sqlite3/common (3.49.2)
+  - sqlite3/dbstatvtab (3.49.2):
    - sqlite3/common
-  - sqlite3/fts5 (3.50.1):
+  - sqlite3/fts5 (3.49.2):
    - sqlite3/common
-  - sqlite3/math (3.50.1):
+  - sqlite3/perf-threadsafe (3.49.2):
    - sqlite3/common
-  - sqlite3/perf-threadsafe (3.50.1):
-    - sqlite3/common
-  - sqlite3/rtree (3.50.1):
+  - sqlite3/rtree (3.49.2):
    - sqlite3/common
  - sqlite3_flutter_libs (0.0.1):
    - Flutter
    - FlutterMacOS
-    - sqlite3 (~> 3.50.1)
+    - sqlite3 (~> 3.49.0)
    - sqlite3/dbstatvtab
    - sqlite3/fts5
-    - sqlite3/math
    - sqlite3/perf-threadsafe
    - sqlite3/rtree
  - system_info_plus (0.0.1):
@@ -269,6 +269,7 @@ DEPENDENCIES:
  - in_app_purchase_storekit (from `.symlinks/plugins/in_app_purchase_storekit/darwin`)
  - integration_test (from `.symlinks/plugins/integration_test/ios`)
  - launcher_icon_switcher (from `.symlinks/plugins/launcher_icon_switcher/ios`)
+  - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
  - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
  - maps_launcher (from `.symlinks/plugins/maps_launcher/ios`)
  - media_extension (from `.symlinks/plugins/media_extension/ios`)
@@ -303,7 +304,7 @@ DEPENDENCIES:
  - workmanager (from `.symlinks/plugins/workmanager/ios`)

 SPEC REPOS:
-  https://github.com/ente-io/ffmpeg-kit-custom-repo-ios:
+  https://github.com/ente-io/ffmpeg-kit-custom-repo-ios.git:
    - ffmpeg_kit_custom
  trunk:
    - Firebase
@@ -376,6 +377,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/integration_test/ios"
  launcher_icon_switcher:
    :path: ".symlinks/plugins/launcher_icon_switcher/ios"
+  local_auth_darwin:
+    :path: ".symlinks/plugins/local_auth_darwin/darwin"
  local_auth_ios:
    :path: ".symlinks/plugins/local_auth_ios/ios"
  maps_launcher:
@@ -442,83 +445,84 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/workmanager/ios"

 SPEC CHECKSUMS:
-  app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7
-  battery_info: 83f3aae7be2fccefab1d2bf06b8aa96f11c8bcdd
-  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
-  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
-  dart_ui_isolate: 46f6714abe6891313267153ef6f9748d8ecfcab1
-  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
+  app_links: f3e17e4ee5e357b39d8b95290a9b2c299fca71c6
+  battery_info: b6c551049266af31556b93c9d9b9452cfec0219f
+  connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d
+  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
+  dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
  ffmpeg_kit_custom: 682b4f2f1ff1f8abae5a92f6c3540f2441d5be99
-  ffmpeg_kit_flutter: 915b345acc97d4142e8a9a8549d177ff10f043f5
-  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
-  Firebase: d99ac19b909cd2c548339c2241ecd0d1599ab02e
-  firebase_core: ece862f94b2bc72ee0edbeec7ab5c7cb09fe1ab5
-  firebase_messaging: e1a5fae495603115be1d0183bc849da748734e2b
-  FirebaseCore: efb3893e5b94f32b86e331e3bd6dadf18b66568e
-  FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4
-  FirebaseInstallations: 317270fec08a5d418fdbc8429282238cab3ac843
-  FirebaseMessaging: 3b26e2cee503815e01c3701236b020aa9b576f09
+  ffmpeg_kit_flutter: 9dce4803991478c78c6fb9f972703301101095fe
+  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
+  Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
+  firebase_core: 6e223dfa350b2edceb729cea505eaaef59330682
+  firebase_messaging: 07fde77ae28c08616a1d4d870450efc2b38cf40d
+  FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
+  FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
+  FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
+  FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8
  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: aa1e9772696691d02cd91fea829856c11efb8e58
-  flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1
-  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
-  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
-  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
-  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
-  flutter_sodium: 7e4621538491834eba53bd524547854bcbbd6987
-  flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
-  fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
+  flutter_email_sender: e03bdda7637bcd3539bfe718fddd980e9508efaa
+  flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e
+  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
+  flutter_local_notifications: ff50f8405aaa0ccdc7dcfb9022ca192e8ad9688f
+  flutter_native_splash: f71420956eb811e6d310720fee915f1d42852e7a
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
+  flutter_sodium: a00383520fc689c688b66fd3092984174712493e
+  flutter_timezone: ac3da59ac941ff1c98a2e1f0293420e020120282
+  fluttertoast: 21eecd6935e7064cc1fcb733a4c5a428f3f24f0f
  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
-  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
-  image_editor_common: 3de87e7c4804f4ae24c8f8a998362b98c105cac1
-  in_app_purchase_storekit: d1a48cb0f8b29dbf5f85f782f5dd79b21b90a5e6
-  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
-  launcher_icon_switcher: 84c218d233505aa7d8655d8fa61a3ba802c022da
+  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
+  image_editor_common: d6f6644ae4a6de80481e89fe6d0a8c49e30b4b43
+  in_app_purchase_storekit: a1ce04056e23eecc666b086040239da7619cd783
+  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  launcher_icon_switcher: 8e0ad2131a20c51c1dd939896ee32e70cd845b37
  libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
-  local_auth_ios: f7a1841beef3151d140a967c2e46f30637cdf451
+  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
+  local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
  Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
-  media_extension: 671e2567880d96c95c65c9a82ccceed8f2e309fd
-  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
-  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
-  motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
-  motionphoto: 23e2aeb5c6380112f69468d71f970fa7438e5ed1
-  move_to_background: 7e3467dd2a1d1013e98c9c1cb93fd53cd7ef9d84
+  maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
+  media_extension: 6618f07abd762cdbfaadf1b0c56a287e820f0c84
+  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
+  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
+  motion_sensors: 03f55b7c637a7e365a0b5f9697a449f9059d5d91
+  motionphoto: 8b65ce50c7d7ff3c767534fc3768b2eed9ac24e4
+  move_to_background: cd3091014529ec7829e342ad2d75c0a11f4378a5
  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  native_video_player: 6809dec117e8997161dbfb42a6f90d6df71a504d
-  objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
-  onnxruntime: f9b296392c96c42882be020a59dbeac6310d81b2
+  native_video_player: 29ab24a926804ac8c4a57eb6d744c7d927c2bc3e
+  objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
+  onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
  onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
  onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
-  open_mail_app: 7314a609e88eed22d53671279e189af7a0ab0f11
+  open_mail_app: 70273c53f768beefdafbe310c3d9086e4da3cb02
  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
-  photo_manager: 1d80ae07a89a67dfbcae95953a1e5a24af7c3e62
-  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a
+  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
+  receive_sharing_intent: 79c848f5b045674ad60b9fea3bafea59962ad2c1
  SDWebImage: f29024626962457f3470184232766516dee8dfea
  SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
  Sentry: da60d980b197a46db0b35ea12cb8f39af48d8854
-  sentry_flutter: 27892878729f42701297c628eb90e7c6529f3684
-  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
-  sqlite3: 1d85290c3321153511f6e900ede7a1608718bbd5
-  sqlite3_flutter_libs: e7fc8c9ea2200ff3271f08f127842131746b70e2
-  system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
-  thermal: d4c48be750d1ddbab36b0e2dcb2471531bc8df41
-  ua_client_hints: 92fe0d139619b73ec9fcb46cc7e079a26178f586
-  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
-  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
-  video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
-  volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
-  wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
-  workmanager: b89e4e4445d8b57ee2fdbf1c3925696ebe5b8990
+  sentry_flutter: 2df8b0aab7e4aba81261c230cbea31c82a62dd1b
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  sqlite3: 3c950dc86011117c307eb0b28c4a7bb449dce9f1
+  sqlite3_flutter_libs: 069c435986dd4b63461aecd68f4b30be4a9e9daa
+  system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
+  thermal: a9261044101ae8f532fa29cab4e8270b51b3f55c
+  ua_client_hints: aeabd123262c087f0ce151ef96fa3ab77bfc8b38
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
+  video_thumbnail: 94ba6705afbaa120b77287080424930f23ea0c40
+  volume_controller: 2e3de73d6e7e81a0067310d17fb70f2f86d71ac7
+  wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
+  workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6

-PODFILE CHECKSUM: cce2cd3351d3488dca65b151118552b680e23635
+PODFILE CHECKSUM: a8ef88ad74ba499756207e7592c6071a96756d18

 COCOAPODS: 1.16.2
--- a/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj
@@ -548,6 +548,7 @@
 				"${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework",
 				"${BUILT_PRODUCTS_DIR}/launcher_icon_switcher/launcher_icon_switcher.framework",
 				"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
+				"${BUILT_PRODUCTS_DIR}/local_auth_darwin/local_auth_darwin.framework",
 				"${BUILT_PRODUCTS_DIR}/local_auth_ios/local_auth_ios.framework",
 				"${BUILT_PRODUCTS_DIR}/maps_launcher/maps_launcher.framework",
 				"${BUILT_PRODUCTS_DIR}/media_extension/media_extension.framework",
@@ -643,6 +644,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/launcher_icon_switcher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth_darwin.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth_ios.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/maps_launcher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/media_extension.framework",
--- a/mobile/apps/photos/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/mobile/apps/photos/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -26,7 +26,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
      shouldUseLaunchSchemeArgsEnv = "YES">
      <MacroExpansion>
         <BuildableReference
@@ -44,13 +43,11 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      debugServiceExtension = "internal"
-      enableGPUValidationMode = "1"
      allowLocationSimulation = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
--- a/mobile/apps/photos/l10n.yaml
+++ b/mobile/apps/photos/l10n.yaml
@@ -0,0 +1,3 @@
+arb-dir: lib/l10n
+template-arb-file: intl_en.arb
+output-localization-file: app_localizations.dart
--- a/mobile/apps/photos/lib/app.dart
+++ b/mobile/apps/photos/lib/app.dart
@@ -5,7 +5,7 @@ import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
-import "package:flutter_localizations/flutter_localizations.dart";
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:home_widget/home_widget.dart' as hw;
 import 'package:logging/logging.dart';
 import 'package:media_extension/media_extension_action_types.dart';
@@ -20,7 +20,6 @@ import 'package:photos/services/app_lifecycle_service.dart';
 import "package:photos/services/home_widget_service.dart";
 import "package:photos/services/memory_home_widget_service.dart";
 import "package:photos/services/people_home_widget_service.dart";
-import "package:photos/services/smart_albums_service.dart";
 import 'package:photos/services/sync/sync_service.dart';
 import 'package:photos/ui/tabs/home_widget.dart';
 import "package:photos/ui/viewer/actions/file_viewer.dart";
@@ -75,10 +74,8 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {
    _peopleChangedSubscription = Bus.instance.on<PeopleChangedEvent>().listen(
      (event) async {
        _changeCallbackDebouncer.run(
-          () async {
-            unawaited(PeopleHomeWidgetService.instance.checkPeopleChanged());
-            unawaited(SmartAlbumsService.instance.syncSmartAlbums());
-          },
+          () async =>
+              unawaited(PeopleHomeWidgetService.instance.checkPeopleChanged()),
        );
      },
    );
@@ -146,10 +143,8 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {
            supportedLocales: appSupportedLocales,
            localeListResolutionCallback: localResolutionCallBack,
            localizationsDelegates: const [
+              ...AppLocalizations.localizationsDelegates,
              S.delegate,
-              GlobalMaterialLocalizations.delegate,
-              GlobalCupertinoLocalizations.delegate,
-              GlobalWidgetsLocalizations.delegate,
            ],
          ),
        ),
@@ -171,10 +166,8 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {
          supportedLocales: appSupportedLocales,
          localeListResolutionCallback: localResolutionCallBack,
          localizationsDelegates: const [
+            ...AppLocalizations.localizationsDelegates,
            S.delegate,
-            GlobalMaterialLocalizations.delegate,
-            GlobalCupertinoLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate,
          ],
        ),
      );
--- a/mobile/apps/photos/lib/core/cache/image_cache.dart
+++ b/mobile/apps/photos/lib/core/cache/image_cache.dart
@@ -1,4 +1,3 @@
-
 import "dart:io";

 import 'package:photos/core/cache/lru_map.dart';
--- a/mobile/apps/photos/lib/core/error-reporting/super_logging.dart
+++ b/mobile/apps/photos/lib/core/error-reporting/super_logging.dart
@@ -1,3 +1,5 @@
+library super_logging;
+
 import 'dart:async';
 import 'dart:collection';
 import 'dart:core';
--- a/mobile/apps/photos/lib/db/entities_db.dart
+++ b/mobile/apps/photos/lib/db/entities_db.dart
@@ -128,21 +128,4 @@ extension EntitiesDB on FilesDB {
    }
    return maps.values.first as String?;
  }
-
-  Future<Map<String, int>> getUpdatedAts(
-    EntityType type,
-    List<String> ids,
-  ) async {
-    final db = await sqliteAsyncDB;
-    final List<Map<String, dynamic>> maps = await db.getAll(
-      'SELECT id, updatedAt FROM entities WHERE type = ? AND id IN (${List.filled(ids.length, '?').join(',')})',
-      [type.name, ...ids],
-    );
-    return Map<String, int>.fromEntries(
-      List.generate(
-        maps.length,
-        (i) => MapEntry(maps[i]['id'] as String, maps[i]['updatedAt'] as int),
-      ),
-    );
-  }
 }
--- a/mobile/apps/photos/lib/db/files_db.dart
+++ b/mobile/apps/photos/lib/db/files_db.dart
@@ -1479,7 +1479,6 @@ class FilesDB with SqlDbBase {

    final inParam = ids.map((id) => "'$id'").join(',');
    final db = await instance.sqliteAsyncDB;
-
    final results = await db.getAll(
      'SELECT * FROM $filesTable WHERE $columnUploadedFileID IN ($inParam) ORDER BY $columnCreationTime $order',
    );
--- a/mobile/apps/photos/lib/db/ml/db.dart
+++ b/mobile/apps/photos/lib/db/ml/db.dart
@@ -316,48 +316,28 @@ class MLDataDB with SqlDbBase implements IMLDataDB<int> {
    // read person from db
    final db = await instance.asyncDB;
    if (personID != null) {
-      logger.info("[$recentFileID] Processing personID path: $personID");
      final List<int> fileId = [recentFileID];
-      logger.info("[$recentFileID] Initial fileId list: $fileId");
-
      int? avatarFileId;
      if (avatarFaceId != null) {
-        logger.info(
-          "[$recentFileID] Looking up avatarFileId for avatarFaceId: $avatarFaceId",
-        );
        avatarFileId = tryGetFileIdFromFaceId(avatarFaceId);
-        logger.info("[$recentFileID] avatarFileId result: $avatarFileId");
        if (avatarFileId != null) {
          fileId.add(avatarFileId);
-          logger.info(
-            "[$recentFileID] Updated fileId list with avatarFileId: $fileId",
-          );
        }
-      } else {
-        logger.info("[$recentFileID] No avatarFaceId provided");
      }
      const String queryClusterID = '''
        SELECT $clusterIDColumn
        FROM $clusterPersonTable
        WHERE $personIdColumn = ?
      ''';
-      logger.info(
-        "[$recentFileID] Executing cluster query for personID: $personID",
-      );
-
      final clusterRows = await db.getAll(
        queryClusterID,
        [personID],
      );
-      logger.info(
-        "[$recentFileID] Found ${clusterRows.length} cluster rows: $clusterRows",
-      );
-
      final clusterIDs =
          clusterRows.map((e) => e[clusterIDColumn] as String).toList();
-      logger.info("[$recentFileID] Extracted clusterIDs: $clusterIDs");

-      final faceQuery = '''
+      final List<Map<String, dynamic>> faceMaps = await db.getAll(
+        '''
        SELECT * FROM $facesTable
        WHERE $faceIDColumn IN (
        SELECT $faceIDColumn
@@ -366,192 +346,48 @@ class MLDataDB with SqlDbBase implements IMLDataDB<int> {
        )
        AND $fileIDColumn IN (${List.filled(fileId.length, '?').join(',')})
        ORDER BY $faceScore DESC
-        ''';
-      final queryParams = [...clusterIDs, ...fileId];
-
-      logger.info(
-        "[$recentFileID] Executing face query with ${clusterIDs.length} clusterIDs and ${fileId.length} fileIDs",
+        ''',
+        [...clusterIDs, ...fileId],
      );
-      logger.info("[$recentFileID] Face query: $faceQuery");
-      logger.info("[$recentFileID] Query parameters: $queryParams");
-
-      final List<Map<String, dynamic>> faceMaps = await db.getAll(
-        faceQuery,
-        queryParams,
-      );
-      logger.info("[$recentFileID] Found ${faceMaps.length} face maps");
      if (faceMaps.isNotEmpty) {
-        logger.info(
-          "[$recentFileID] Found ${faceMaps.length} faces, processing selection",
-        );
        if (avatarFileId != null) {
-          logger.info(
-            "[$recentFileID] Looking for face with avatarFileId: $avatarFileId",
-          );
          final row = faceMaps.firstWhereOrNull(
            (element) => (element[fileIDColumn] as int) == avatarFileId,
          );
          if (row != null) {
-            logger.info(
-              "[$recentFileID] Found avatar face, returning: ${row[faceIDColumn]}",
-            );
-            final face = mapRowToFace(row);
-            logger.info(
-              "[$recentFileID] getCoverFaceForPerson SUCCESS (avatar): returning face ${face.faceID}",
-            );
-            return face;
-          } else {
-            logger.info(
-              "[$recentFileID] Avatar face not found in results, falling back to first face",
-            );
+            return mapRowToFace(row);
          }
        }
-        logger.info(
-          "[$recentFileID] Returning first face: ${faceMaps.first[faceIDColumn]}",
-        );
-        final face = mapRowToFace(faceMaps.first);
-        logger.info(
-          "[$recentFileID] getCoverFaceForPerson SUCCESS (first): returning face ${face.faceID}",
-        );
-        return face;
-      } else {
-        // Diagnostic queries to understand why faceMaps is empty
-        logger.info(
-          "[$recentFileID] faceMaps is empty, running diagnostic queries",
-        );
-
-        // Test 1: Check if faces exist in faceClustersTable for these clusterIDs
-        if (clusterIDs.isNotEmpty) {
-          final faceIDsInClusters = await db.getAll(
-            '''
-            SELECT $faceIDColumn
-            FROM $faceClustersTable
-            WHERE $clusterIDColumn IN (${List.filled(clusterIDs.length, '?').join(',')})
-            ''',
-            clusterIDs,
-          );
-          logger.info(
-            "[$recentFileID] Found ${faceIDsInClusters.length} faceIDs in faceClustersTable for clusterIDs: ${faceIDsInClusters.map((e) => e[faceIDColumn]).toList()}",
-          );
-
-          // Test 2: Check if any of those faces exist in facesTable
-          if (faceIDsInClusters.isNotEmpty) {
-            final faceIDsFromClusters = faceIDsInClusters
-                .map((e) => e[faceIDColumn] as String)
-                .toList();
-            final facesInFacesTable = await db.getAll(
-              '''
-              SELECT $faceIDColumn, $fileIDColumn
-              FROM $facesTable
-              WHERE $faceIDColumn IN (${List.filled(faceIDsFromClusters.length, '?').join(',')})
-              ''',
-              faceIDsFromClusters,
-            );
-            logger.info(
-              "[$recentFileID] Found ${facesInFacesTable.length} faces in facesTable: ${facesInFacesTable.map((e) => '${e[faceIDColumn]}(file:${e[fileIDColumn]})').toList()}",
-            );
-
-            // Test 3: Check if any of those faces are for our target fileIDs
-            final facesForTargetFiles = facesInFacesTable
-                .where(
-                  (face) => fileId.contains(face[fileIDColumn] as int),
-                )
-                .toList();
-            logger.info(
-              "[$recentFileID] Found ${facesForTargetFiles.length} faces for target fileIDs $fileId: ${facesForTargetFiles.map((e) => '${e[faceIDColumn]}(file:${e[fileIDColumn]})').toList()}",
-            );
-          } else {
-            logger.info(
-              "[$recentFileID] No faceIDs found in faceClustersTable for these clusterIDs",
-            );
-          }
-        } else {
-          logger.info("[$recentFileID] No clusterIDs to check");
-        }
-
-        // Test 4: Check if there are any faces at all for the target fileIDs
-        final allFacesForFiles = await db.getAll(
-          '''
-          SELECT $faceIDColumn, $fileIDColumn
-          FROM $facesTable
-          WHERE $fileIDColumn IN (${List.filled(fileId.length, '?').join(',')})
-          ''',
-          fileId,
-        );
-        logger.info(
-          "[$recentFileID] Found ${allFacesForFiles.length} total faces for fileIDs $fileId: ${allFacesForFiles.map((e) => '${e[faceIDColumn]}(file:${e[fileIDColumn]})').toList()}",
-        );
-
-        if (clusterID == null) {
-          logger.severe(
-            "[$recentFileID] Didn't find any faces for personID $personID in getCoverFaceForPerson. fileID: $fileId, clusterIDs: $clusterIDs",
-          );
-        } else {
-          logger.info(
-            "[$recentFileID] No faces found for personID, but clusterID provided, will try clusterID path",
-          );
-        }
+        return mapRowToFace(faceMaps.first);
      }
    }
    if (clusterID != null) {
-      logger.info("[$recentFileID] Processing clusterID path: $clusterID");
      const String queryFaceID = '''
        SELECT $faceIDColumn
        FROM $faceClustersTable
        WHERE $clusterIDColumn = ?
      ''';
-      logger.info(
-        "[$recentFileID] Executing faceID query for clusterID: $clusterID",
-      );
-      logger.info("[$recentFileID] Query: $queryFaceID");
-
      final List<Map<String, dynamic>> faceMaps = await db.getAll(
        queryFaceID,
        [clusterID],
      );
-      logger.info(
-        "[$recentFileID] Found ${faceMaps.length} face mappings for cluster: ${faceMaps.map((e) => e[faceIDColumn]).toList()}",
-      );
-
      final List<Face>? faces = await getFacesForGivenFileID(recentFileID);
-      logger.info(
-        "[$recentFileID] getFacesForGivenFileID returned ${faces?.length ?? 0} faces: ${faces?.map((f) => f.faceID).toList() ?? []}",
-      );
-
      if (faces != null) {
-        logger.info(
-          "[$recentFileID] Searching for matching face in ${faces.length} faces",
-        );
        for (final face in faces) {
-          final isMatch = faceMaps.any(
+          if (faceMaps.any(
            (element) => (element[faceIDColumn] as String) == face.faceID,
-          );
-          logger.info(
-            "[$recentFileID] Checking face ${face.faceID}: match=$isMatch",
-          );
-          if (isMatch) {
-            logger.info(
-              "[$recentFileID] getCoverFaceForPerson SUCCESS (cluster): returning face ${face.faceID}",
-            );
+          )) {
            return face;
          }
        }
-        logger.info(
-          "[$recentFileID] No matching faces found in file for clusterID",
-        );
-      } else {
-        logger.severe(
-          "[$recentFileID] Didn't find any faces for clusterID $clusterID in getCoverFaceForPerson. faces: $faces",
-        );
      }
    }
    if (personID == null && clusterID == null) {
-      logger
-          .severe("[$recentFileID] personID and clusterID cannot be null both");
+      _logger.severe("personID and clusterID cannot be null both");
      throw Exception("personID and clusterID cannot be null");
    }
-    logger.severe(
-      "[$recentFileID] getCoverFaceForPerson FAILED: No face found (personID: $personID, clusterID: $clusterID)",
+    _logger.severe(
+      "Something went wrong finding a face from `getCoverFaceForPerson` (personID: $personID, clusterID: $clusterID)",
    );
    return null;
  }
--- a/mobile/apps/photos/lib/ente_theme_data.dart
+++ b/mobile/apps/photos/lib/ente_theme_data.dart
@@ -42,22 +42,20 @@ final lightThemeData = ThemeData(
    bodyLarge: const TextStyle(color: Colors.orange),
  ),
  cardColor: const Color.fromRGBO(250, 250, 250, 1.0),
-  dialogTheme: const DialogThemeData(
-    backgroundColor: Color.fromRGBO(250, 250, 250, 1.0), //
-    titleTextStyle: TextStyle(
+  dialogTheme: const DialogTheme().copyWith(
+    backgroundColor: const Color.fromRGBO(250, 250, 250, 1.0), //
+    titleTextStyle: const TextStyle(
      color: Colors.black,
      fontSize: 24,
      fontWeight: FontWeight.w600,
    ),
-    contentTextStyle: TextStyle(
+    contentTextStyle: const TextStyle(
      fontFamily: 'Inter-Medium',
      color: Colors.black,
      fontSize: 16,
      fontWeight: FontWeight.w500,
    ),
-    shape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.all(Radius.circular(8)),
-    ),
+    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
  ),
  inputDecorationTheme: const InputDecorationTheme().copyWith(
    focusedBorder: const UnderlineInputBorder(
@@ -119,22 +117,20 @@ final darkThemeData = ThemeData(
    elevation: 0,
  ),
  cardColor: const Color.fromRGBO(10, 15, 15, 1.0),
-  dialogTheme: const DialogThemeData(
-    backgroundColor: Color.fromRGBO(15, 15, 15, 1.0),
-    titleTextStyle: TextStyle(
+  dialogTheme: const DialogTheme().copyWith(
+    backgroundColor: const Color.fromRGBO(15, 15, 15, 1.0),
+    titleTextStyle: const TextStyle(
      color: Colors.white,
      fontSize: 24,
      fontWeight: FontWeight.w600,
    ),
-    contentTextStyle: TextStyle(
+    contentTextStyle: const TextStyle(
      fontFamily: 'Inter-Medium',
      color: Colors.white,
      fontSize: 16,
      fontWeight: FontWeight.w500,
    ),
-    shape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.all(Radius.circular(8)),
-    ),
+    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
  ),
  inputDecorationTheme: const InputDecorationTheme().copyWith(
    focusedBorder: const UnderlineInputBorder(
@@ -210,7 +206,7 @@ TextTheme _buildTextTheme(Color textColor) {
      fontWeight: FontWeight.w500,
    ),
    bodySmall: TextStyle(
-      color: textColor.withValues(alpha: 0.6),
+      color: textColor.withOpacity(0.6),
      fontSize: 14,
      fontWeight: FontWeight.w500,
    ),
@@ -282,7 +278,7 @@ extension CustomColorScheme on ColorScheme {
      : const Color.fromRGBO(48, 48, 48, 0.5);

  Color get iconColor => brightness == Brightness.light
-      ? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.75)
+      ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.75)
      : const Color.fromRGBO(255, 255, 255, 1);

  Color get bgColorForQuestions => brightness == Brightness.light
@@ -293,7 +289,7 @@ extension CustomColorScheme on ColorScheme {

  Color get cupertinoPickerTopColor => brightness == Brightness.light
      ? const Color.fromARGB(255, 238, 238, 238)
-      : const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.1);
+      : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.1);

  Color get stepProgressUnselectedColor => brightness == Brightness.light
      ? const Color.fromRGBO(196, 196, 196, 0.6)
@@ -304,20 +300,20 @@ extension CustomColorScheme on ColorScheme {
      : const Color.fromRGBO(20, 20, 20, 1);

  Color get galleryThumbDrawColor => brightness == Brightness.light
-      ? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.8)
-      : const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.5);
+      ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.8)
+      : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.5);

  Color get backupEnabledBgColor => brightness == Brightness.light
      ? const Color.fromRGBO(230, 230, 230, 0.95)
      : const Color.fromRGBO(10, 40, 40, 0.3);

  Color get dotsIndicatorActiveColor => brightness == Brightness.light
-      ? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.5)
-      : const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.5);
+      ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.5)
+      : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.5);

  Color get dotsIndicatorInactiveColor => brightness == Brightness.light
-      ? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.12)
-      : const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.12);
+      ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.12)
+      : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.12);

  Color get toastTextColor => brightness == Brightness.light
      ? const Color.fromRGBO(255, 255, 255, 1)
@@ -340,8 +336,8 @@ extension CustomColorScheme on ColorScheme {
      : const Color.fromRGBO(150, 150, 150, 1);

  Color get searchResultsBackgroundColor => brightness == Brightness.light
-      ? Colors.black.withValues(alpha: 0.32)
-      : Colors.black.withValues(alpha: 0.64);
+      ? Colors.black.withOpacity(0.32)
+      : Colors.black.withOpacity(0.64);

  EnteTheme get enteTheme =>
      brightness == Brightness.light ? lightTheme : darkTheme;
--- a/mobile/apps/photos/lib/main.dart
+++ b/mobile/apps/photos/lib/main.dart
@@ -57,10 +57,9 @@ const kLastFGTaskHeartBeatTime = "fg_task_hb_time";
 const kHeartBeatFrequency = Duration(seconds: 1);
 const kFGSyncFrequency = Duration(minutes: 5);
 const kFGHomeWidgetSyncFrequency = Duration(minutes: 15);
-const kBGTaskTimeout = Duration(seconds: 58);
+const kBGTaskTimeout = Duration(seconds: 28);
 const kBGPushTimeout = Duration(seconds: 28);
 const kFGTaskDeathTimeoutInMicroseconds = 5000000;
-bool isProcessBg = true;

 void main() async {
  debugRepaintRainbowEnabled = false;
@@ -87,7 +86,6 @@ void main() async {
 Future<void> _runInForeground(AdaptiveThemeMode? savedThemeMode) async {
  return await runWithLogs(() async {
    _logger.info("Starting app in foreground");
-    isProcessBg = false;
    await _init(false, via: 'mainMethod');
    final Locale? locale = await getLocale(noFallback: true);
    runApp(
@@ -308,7 +306,7 @@ void logLocalSettings() {
  );
  _logger.info("Gallery grid size: ${localSettings.getPhotoGridSize()}");
  _logger.info(
-    "Video streaming is enabled: ${VideoPreviewService.instance.isVideoStreamingEnabled}",
+    "Video streaming is enalbed: ${VideoPreviewService.instance.isVideoStreamingEnabled}",
  );
 }

--- a/mobile/apps/photos/lib/models/api/entity/type.dart
+++ b/mobile/apps/photos/lib/models/api/entity/type.dart
@@ -5,7 +5,6 @@ enum EntityType {
  person,
  cgroup,
  unknown,
-  smartConfig,
 }

 EntityType typeFromString(String type) {
@@ -16,8 +15,6 @@ EntityType typeFromString(String type) {
      return EntityType.location;
    case "cgroup":
      return EntityType.cgroup;
-    case "sconfig":
-      return EntityType.cgroup;
  }
  debugPrint("unexpected entity type $type");
  return EntityType.unknown;
@@ -25,13 +22,10 @@ EntityType typeFromString(String type) {

 extension EntityTypeExtn on EntityType {
  bool isZipped() {
-    switch (this) {
-      case EntityType.location:
-      case EntityType.person:
-        return false;
-      default:
-        return true;
+    if (this == EntityType.location || this == EntityType.person) {
+      return false;
    }
+    return true;
  }

  String typeToString() {
@@ -42,8 +36,6 @@ extension EntityTypeExtn on EntityType {
        return "person";
      case EntityType.cgroup:
        return "cgroup";
-      case EntityType.smartConfig:
-        return "sconfig";
      case EntityType.unknown:
        return "unknown";
    }
--- a/mobile/apps/photos/lib/models/api/user/srp.dart
+++ b/mobile/apps/photos/lib/models/api/user/srp.dart
@@ -5,7 +5,6 @@ class SetupSRPRequest {
  final String srpA;
  final bool isUpdate;

-
  SetupSRPRequest({
    required this.srpUserID,
    required this.srpSalt,
@@ -82,6 +81,7 @@ class CompleteSRPSetupRequest {
    );
  }
 }
+
 class SrpAttributes {
  final String srpUserID;
  final String srpSalt;
--- a/mobile/apps/photos/lib/models/collection/smart_album_config.dart
+++ b/mobile/apps/photos/lib/models/collection/smart_album_config.dart
@@ -1,143 +0,0 @@
-typedef PersonInfo = ({int updatedAt, Set<int> addedFiles});
-
-class SmartAlbumConfig {
-  // A nullable remote ID for syncing purposes
-  final String? remoteId;
-
-  final int collectionId;
-  // person ids
-  final Set<String> personIDs;
-  // person id mapped with updatedat, file ids
-  final Map<String, PersonInfo> infoMap;
-  final int updatedAt;
-
-  SmartAlbumConfig({
-    this.remoteId,
-    required this.collectionId,
-    required this.personIDs,
-    required this.infoMap,
-    this.updatedAt = 0,
-  });
-
-  Future<SmartAlbumConfig> getUpdatedConfig(Set<String> newPersonsIds) async {
-    final toAdd = newPersonsIds.difference(personIDs);
-    final toRemove = personIDs.difference(newPersonsIds);
-    final newInfoMap = Map<String, PersonInfo>.from(infoMap);
-
-    // Remove whats not needed
-    for (final personId in toRemove) {
-      newInfoMap.remove(personId);
-    }
-
-    // Add files which are needed
-    for (final personId in toAdd) {
-      newInfoMap[personId] = (updatedAt: 0, addedFiles: <int>{});
-    }
-
-    return SmartAlbumConfig(
-      remoteId: remoteId,
-      collectionId: collectionId,
-      personIDs: newPersonsIds,
-      infoMap: newInfoMap,
-      updatedAt: DateTime.now().millisecondsSinceEpoch,
-    );
-  }
-
-  Future<SmartAlbumConfig> addFiles(
-    String personId,
-    int updatedAt,
-    Set<int> fileId,
-  ) async {
-    if (!infoMap.containsKey(personId)) {
-      return this;
-    }
-
-    final newInfoMap = Map<String, PersonInfo>.from(infoMap);
-    newInfoMap[personId] = (
-      updatedAt: updatedAt,
-      addedFiles: newInfoMap[personId]!.addedFiles.union(fileId),
-    );
-    return SmartAlbumConfig(
-      remoteId: remoteId,
-      collectionId: collectionId,
-      personIDs: personIDs,
-      infoMap: newInfoMap,
-      updatedAt: DateTime.now().millisecondsSinceEpoch,
-    );
-  }
-
-  // toJson and fromJson methods
-  Map<String, dynamic> toJson() {
-    return {
-      "remote_id": remoteId,
-      "collection_id": collectionId,
-      "person_ids": personIDs.toList(),
-      "updated_at": updatedAt,
-      "info_map": infoMap.map(
-        (key, value) => MapEntry(
-          key,
-          {
-            "updated_at": value.updatedAt,
-            "added_files": value.addedFiles.toList(),
-          },
-        ),
-      ),
-    };
-  }
-
-  factory SmartAlbumConfig.fromJson(
-    Map<String, dynamic> json,
-    String? remoteId,
-    int? updatedAt,
-  ) {
-    final personIDs = Set<String>.from(json["person_ids"] as List? ?? []);
-    final infoMap = (json["info_map"] as Map<String, dynamic>).map(
-      (key, value) => MapEntry(
-        key,
-        (
-          updatedAt: value["updated_at"] as int? ??
-              DateTime.now().millisecondsSinceEpoch,
-          addedFiles: Set<int>.from(value["added_files"] as List? ?? []),
-        ),
-      ),
-    );
-
-    return SmartAlbumConfig(
-      remoteId: remoteId,
-      collectionId: json["collection_id"] as int,
-      personIDs: personIDs,
-      infoMap: infoMap,
-      updatedAt: updatedAt ?? DateTime.now().millisecondsSinceEpoch,
-    );
-  }
-
-  SmartAlbumConfig merge(SmartAlbumConfig b) {
-    if (remoteId == b.remoteId) {
-      if (updatedAt >= b.updatedAt) {
-        return this;
-      }
-      return b;
-    }
-    return SmartAlbumConfig(
-      remoteId: b.updatedAt <= updatedAt ? b.remoteId : remoteId,
-      collectionId: b.collectionId,
-      personIDs: personIDs.union(b.personIDs),
-      infoMap: {
-        ...infoMap,
-        ...b.infoMap.map(
-          (key, value) => MapEntry(
-            key,
-            (
-              updatedAt: infoMap[key]?.updatedAt != null &&
-                      infoMap[key]!.updatedAt > value.updatedAt
-                  ? infoMap[key]!.updatedAt
-                  : value.updatedAt,
-              addedFiles: infoMap[key]?.addedFiles.union(value.addedFiles) ??
-                  value.addedFiles,
-            ),
-          ),
-        ),
-      },
-    );
-  }
-}
--- a/mobile/apps/photos/lib/module/download/manager.dart
+++ b/mobile/apps/photos/lib/module/download/manager.dart
@@ -167,7 +167,7 @@ class DownloadManager {
        final existingSize = await baseFile.length();
        if (existingSize == task.totalBytes) {
          _logger.info(
-            'Download already exists for ${task.filename} ($existingSize/${task.totalBytes} bytes)',
+            'Download already exists for ${task.filename} (${existingSize}/${task.totalBytes} bytes)',
          );
          task = task.copyWith(
            status: DownloadStatus.completed,
--- a/mobile/apps/photos/lib/services/collections_service.dart
+++ b/mobile/apps/photos/lib/services/collections_service.dart
@@ -1427,12 +1427,20 @@ class CollectionsService {
      }
      // group files by collectionID
      final Map<int, List<EnteFile>> filesByCollection = {};
+      final Map<int, Set<int>> fileSeenByCollection = {};
      for (final file in filesToCopy) {
-        if (filesByCollection.containsKey(file.collectionID!)) {
-          filesByCollection[file.collectionID!]!.add(file.copyWith());
-        } else {
-          filesByCollection[file.collectionID!] = [file.copyWith()];
+        fileSeenByCollection.putIfAbsent(file.collectionID!, () => <int>{});
+        if (fileSeenByCollection[file.collectionID]!
+            .contains(file.uploadedFileID)) {
+          _logger.warning(
+            "skip copy, duplicate ID: ${file.uploadedFileID} in collection "
+            "${file.collectionID}",
+          );
+          continue;
        }
+        filesByCollection
+            .putIfAbsent(file.collectionID!, () => [])
+            .add(file.copyWith());
      }
      for (final entry in filesByCollection.entries) {
        final srcCollectionID = entry.key;
@@ -1579,9 +1587,6 @@ class CollectionsService {
      params["files"] = [];
      for (final batchFile in batch) {
        final fileKey = getFileKey(batchFile);
-        _logger.info(
-          "srcCollection : $srcCollectionID  file: ${batchFile.uploadedFileID}  key: ${CryptoUtil.bin2base64(fileKey)} ",
-        );
        final encryptedKeyData =
            CryptoUtil.encryptSync(fileKey, getCollectionKey(dstCollectionID));
        batchFile.encryptedKey =
@@ -1643,17 +1648,27 @@ class CollectionsService {
    );
    final List<EnteFile> filesToCopy = [];
    final List<EnteFile> filesToAdd = [];
+    final Set<int> seenForAdd = {};
+    final Set<int> seenForCopy = {};
+
    for (final EnteFile file in othersFile) {
-      if (hashToUserFile.containsKey(file.hash ?? '')) {
-        final userFile = hashToUserFile[file.hash]!;
-        if (userFile.fileType == file.fileType) {
-          filesToAdd.add(userFile);
-        } else {
-          filesToCopy.add(file);
-        }
-      } else {
-        filesToCopy.add(file);
+      final userFile = hashToUserFile[file.hash ?? ''];
+      final bool shouldAdd =
+          userFile != null && userFile.fileType == file.fileType;
+      final targetList = shouldAdd ? filesToAdd : filesToCopy;
+      final seenSet = shouldAdd ? seenForAdd : seenForCopy;
+      final fileToProcess = shouldAdd ? userFile : file;
+      final uploadID = fileToProcess.uploadedFileID;
+
+      if (seenSet.contains(uploadID)) {
+        final action = shouldAdd ? "adding" : "copying";
+        _logger.warning(
+          "skip $action file $uploadID as it is already ${action}ed",
+        );
+        continue;
      }
+      targetList.add(fileToProcess);
+      seenSet.add(uploadID!);
    }
    return (filesToAdd, filesToCopy);
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
laurenspriem	a318977001	sort imports	2025-07-23 19:48:22 +02:00
laurenspriem	eff471c739	Resolve merge conflicts	2025-07-23 19:47:44 +02:00
laurenspriem	5454b262a4	Merge branch 'main' into rust_processing	2025-07-23 19:38:05 +02:00
Laurens Priem	e9ef9d55a4	[mob][photos] Face thumbnail lower severity logging (#6617 ) ## Description ## Tests	2025-07-23 13:50:19 +02:00
laurenspriem	968f04c04a	Lower severity logging	2025-07-23 13:45:37 +02:00
Laurens Priem	59cb3f091e	[mob][photos] Face thumbnail fix + smooth scroll (#6616 ) ## Description - Fix internal issue with face thumbnail generation - Make all people page scroll more smooth ## Tests Tested on internal build.	2025-07-23 13:40:25 +02:00
Neeraj	630f5a2706	[mob/photos] [fix] Handle duplicate fileID during addOrCopy (#6614 ) ## Description If others file contains two files with same hash, we are returning same FileID twice for add or copy operation. This change fixes that behaviour. ## Tests	2025-07-23 16:53:13 +05:30
Neeraj Gupta	4a743be322	[mob]Handle duplicate fileID during addOrCopy	2025-07-23 16:46:37 +05:30
Neeraj	c2db1f7da9	[web] Update download link for auth apps (#6615 ) ## Description ## Tests	2025-07-23 16:45:35 +05:30
Neeraj	843e956a8a	[web] Update download link for auth apps	2025-07-23 16:45:04 +05:30
laurenspriem	c2d1c66888	keep alive face thumbnail when scrolling fast	2025-07-23 12:45:09 +02:00
Aman Raj Singh Mourya	e2aabfb95a	[auth] add custom icon for Startmail (#6611 ) Adding Custom Icon for Startmail.com ## Description Add custom SVG icon for [Startmail](https://www.startmail.com/) to support branding in UI components. ## Tests	2025-07-23 16:05:49 +05:30
Neeraj	dbf88c7bed	[mob] Skip dup fileID from src collection during copy (#6612 ) ## Description ## Tests	2025-07-23 15:46:16 +05:30
Neeraj Gupta	a06a5be983	[mob] Skip dup fileID from src collection during copy	2025-07-23 15:45:20 +05:30
max977	3bba125f1c	custom-icon-startmail Adding Custom Icon for Startmail	2025-07-23 11:51:25 +02:00
laurenspriem	1718e5d1d6	More careful logging	2025-07-23 11:33:30 +02:00
laurenspriem	b16c9af36b	Logging in super isolate when starting operation	2025-07-23 10:47:01 +02:00
laurenspriem	1cc3499019	face thumbnail fix pragma entry point	2025-07-23 10:34:19 +02:00
laurenspriem	4260c3c769	Remove redundant code	2025-07-23 10:33:31 +02:00
laurenspriem	209291e09a	Rename isolate components for clarity	2025-07-23 10:32:58 +02:00
Aman Raj Singh Mourya	dd08ca82fe	add unitedhealthgroup icona and added more altnames to previously added colorado icon (#6607 ) ## Description ## Tests	2025-07-23 00:01:21 +05:30
slacker-treat-deferred-unbuckled-jiffy	8d71a6bb58	Update custom-icons.json	2025-07-22 10:12:45 -06:00
slacker-treat-deferred-unbuckled-jiffy	c583fa4742	Add files via upload	2025-07-22 10:10:35 -06:00
Aman Raj Singh Mourya	ec0d3c4266	[auth] Add numerai and nasdaq icons (#6586 ) ## Description ## Tests	2025-07-22 14:09:05 +05:30
Murad Khalil	55cc92e57d	Update custom-icons.json fixed nasdaq entry	2025-07-22 10:06:25 +02:00
Murad Khalil	3f71d491e9	Merge branch 'ente-io:main' into main	2025-07-22 10:02:14 +02:00
Aman Raj Singh Mourya	304daf0b09	Minor Fix	2025-07-22 13:24:12 +05:30
Aman Raj Singh Mourya	e1281657ba	Add icons for availity, bestbuy, colorado, emeritihealth, lincolnfinancial (#6601 ) ## Description ## Tests	2025-07-22 13:16:49 +05:30
Aman Raj Singh Mourya	595871f571	feat(ente-auth): Add custom icon for Pangolin (#6604 ) ## Description This PR adds the Pangolin icon for auth	2025-07-22 13:14:22 +05:30
Manav Rathi	d31127c2e3	[docs] Simplify (#6606 )	2025-07-22 12:03:22 +05:30
Manav Rathi	09d7b82c08	Simplify	2025-07-22 10:56:01 +05:30
Rafael Ieda	88c9f4943b	feat(ente-auth): Add custom icon for Pangolin	2025-07-21 22:50:50 -03:00
slacker-treat-deferred-unbuckled-jiffy	cacc7dc85a	Add files via upload	2025-07-21 13:55:34 -06:00
slacker-treat-deferred-unbuckled-jiffy	24a30709cd	Update custom-icons.json	2025-07-21 13:55:12 -06:00
Murad Khalil	054ad8b480	add numerai and nasdaq icons	2025-07-20 23:15:27 +02:00
laurenspriem	e5e86fb41a	Merge branch 'main' into rust_processing	2025-01-14 15:37:51 +05:30
laurenspriem	1e9cc64a64	[mob][photos] Remove temp logging	2024-11-21 16:27:49 +05:30
laurenspriem	0205bec30a	[mob][photos] Temp log embeddings	2024-11-19 15:21:25 +05:30
laurenspriem	fad0c4559f	[mob][photos] Proper letterbox processing for yolo face	2024-11-09 12:17:53 +05:30
laurenspriem	2e4866d302	[mob][photos] Remove old separate rust methods	2024-11-08 09:57:04 +05:30
laurenspriem	aadbe75c50	[mob][photos] Correct time logging	2024-11-08 09:53:38 +05:30
laurenspriem	899bf79460	[mob][photos] Clean up old dart preprocessing methods	2024-11-08 09:25:00 +05:30
laurenspriem	21af6d0070	[mob][photos] Timing logs	2024-11-08 08:51:42 +05:30
laurenspriem	1bad2b3555	[mob][photos] Mix of flutter and rust decoding	2024-11-08 08:41:14 +05:30
laurenspriem	ffa50df43e	[mob][photos] Decode heic in rust	2024-11-08 07:56:28 +05:30
laurenspriem	8fdc7dcd89	[mob][photos] Decode only in rust	2024-11-06 16:04:29 +05:30
laurenspriem	1ed26567a5	[mob][photos] translations	2024-11-06 15:29:19 +05:30
laurenspriem	6101570c9d	[mob][photos] Add missing supported formats	2024-11-06 15:29:03 +05:30
laurenspriem	a33bbb22ae	[mob][photos] Single rust method for faces and clip preprocessing	2024-11-06 14:46:53 +05:30
laurenspriem	a2661ef6ed	[mob][photos] clip rust processing	2024-11-06 12:10:22 +05:30
laurenspriem	8daa22e423	[mob][photos] improve rust face preprocessing	2024-11-05 17:05:03 +05:30
laurenspriem	aeb2235875	[mob][photos] Time rust processing	2024-11-05 11:02:04 +05:30
laurenspriem	bf903562f6	[mob][photos] flutter rust bridge configuration	2024-11-05 10:59:32 +05:30
laurenspriem	9cb7c01481	[mob][photos] Use image processing for face detection	2024-11-04 13:54:53 +05:30
laurenspriem	233d1715e9	[mob][photos] flutter rust bridge generate	2024-11-04 11:56:32 +05:30
laurenspriem	e3c019f7ed	[mob][photos] Rust bridge auto format	2024-11-04 11:51:51 +05:30
				`@@ -0,0 +1 @@`
				<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 638 638"><defs><style>.cls-1{fill:#104ab8;}.cls-1,.cls-2,.cls-3,.cls-4{fill-rule:evenodd;}.cls-2{fill:#fff;}.cls-3{fill:#ffed31;}.cls-4{fill:#1c252c;}</style></defs><title>Best Buy Logo Vector</title><g id="logo-en"><polygon class="cls-1" points="0 0 638 0 638 638 0 638 0 0 0 0"/><path class="cls-2" d="M232,347.26V482.49h70.8c27.87,0,53.62-9.78,53.62-38.51,0-19.42-14-28.29-29.38-32.93,9.37-3.76,20-11.66,20-28.23,0-21.2-21-35.56-49.35-35.56Zm43.37,31.5h15.95c6.49,0,11.44,5.08,11.44,10.24,0,4.8-5.14,9.93-11.44,9.93H275.41V378.76Zm0,48.23h21c7.35,0,13.52,5.59,13.52,12,0,6.78-5.77,12.4-14.79,12.4H275.41V427Z" transform="translate(-181 -181)"/><path class="cls-2" d="M267.12,497.24V632.46h70.8c27.87,0,53.62-9.78,53.62-38.51,0-19.42-14-28.29-29.38-32.93,9.38-3.76,20-11.66,20-28.22,0-21.2-21-35.56-49.35-35.56Zm43.37,31.49h15.95c6.49,0,11.44,5.08,11.44,10.25,0,4.79-5.14,9.92-11.44,9.92H310.49V528.73Zm0,48.24h21.05c7.35,0,13.52,5.58,13.52,12,0,6.77-5.77,12.4-14.79,12.4H310.49V577Z" transform="translate(-181 -181)"/><polygon class="cls-2" points="178.87 301.47 178.87 166.25 287.94 166.25 287.94 198.9 222.11 198.9 222.11 216.64 275.56 216.64 275.56 247.25 222.11 247.25 222.11 268.94 287.94 268.94 287.94 301.47 178.87 301.47 178.87 301.47"/><path class="cls-2" d="M528,486.34c30.7,0,55.26-17.51,55.26-45.89,0-45.8-59.58-38.75-59.58-53,0-5.51,5.79-8.43,11.73-8.43,10.24,0,17.64,6.74,17.64,6.74l25.63-24.41c-10.25-9.75-26.44-18-48.26-18-32.75,0-54.19,19.45-54.19,42.9,0,46.38,58.73,39.65,58.73,54.2,0,5.11-4.91,10.24-13.81,10.24-10.11,0-18.12-6.1-24.35-11.28L471,464c10.38,10.12,27,22.32,57,22.32Z" transform="translate(-181 -181)"/><polygon class="cls-2" points="435.66 301.47 435.66 198.78 399.94 198.78 399.94 166.25 514.75 166.25 514.75 198.78 479.04 198.78 479.04 301.47 435.66 301.47 435.66 301.47"/><path class="cls-2" d="M393,497.14h43.25v81c0,8.22,8.19,15.8,16.72,15.8,8.05,0,16.19-6.84,16.19-16.23V497.14h43.12v80c0,31.76-26.36,57.09-60.45,57.09-34.28,0-58.83-27.57-58.83-58.82V497.14Z" transform="translate(-181 -181)"/><polygon class="cls-2" points="384.63 451.37 384.63 403.05 333.81 316.14 377.56 316.14 406.32 362.7 435.18 316.14 479.04 316.14 428.01 403.54 428.01 451.37 384.63 451.37 384.63 451.37"/><polygon class="cls-3" points="479.04 390.15 453.52 415.66 453.52 450.11 479.04 475.62 586.96 475.62 586.96 390.15 479.04 390.15 479.04 390.15"/><path class="cls-4" d="M655.85,613.87a5.75,5.75,0,1,1-5.75-5.74,5.74,5.74,0,0,1,5.75,5.74Z" transform="translate(-181 -181)"/></g></svg>