Bump version

Note: Not certain that this is the right way to update listing metadata. Read through this PR for a better idea why: https://github.com/ente-io/ente/pull/1313

.github/workflows/auth-internal-release.yml

@@ -40,7 +40,7 @@ jobs:
 
             - name: Build PlayStore AAB
               run: |
-                  flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore
+                  flutter build appbundle --dart-define=cronetHttpNoPlay=true --release --flavor playstore
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}

.github/workflows/auth-release.yml

@@ -32,8 +32,8 @@ env:
     FLUTTER_VERSION: "3.24.3"
 
 jobs:
-    build-ubuntu:
-        runs-on: ubuntu-20.04
+    build-linux-latest:
+        runs-on: ubuntu-latest
 
         defaults:
             run:
@@ -68,7 +68,7 @@ jobs:
 
             - name: Build independent APK
               run: |
-                  flutter build apk --release --flavor independent --dart-define=app.flavor=independent
+                  flutter build apk --dart-define=cronetHttpNoPlay=true --release --flavor independent
                   mv build/app/outputs/flutter-apk/app-independent-release.apk artifacts/ente-${{ github.ref_name }}.apk
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
@@ -90,22 +90,31 @@ jobs:
             - name: Install dependencies for desktop build
               run: |
                   sudo apt-get update -y
-                  sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config libsqlite3-dev locate appindicator3-0.1 libappindicator3-dev libffi-dev libtiff5
+                  sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff6 xz-utils libarchive-tools libcurl4-openssl-dev
                   sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
 
+            - name: Install appimagetool
+              run: |
+                  wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+                  chmod +x appimagetool
+                  mv appimagetool /usr/local/bin/
+
             - name: Build desktop app
               run: |
                   flutter config --enable-linux-desktop
-                  # dart pub global activate flutter_distributor
-                  dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor
+                  dart pub global activate --source git https://github.com/ente-io/flutter_distributor_fork --git-ref develop --git-path packages/flutter_distributor
+                  # RPM
+                  flutter_distributor package --platform=linux --targets=rpm --skip-clean
+                  mv dist/**/*-*-linux.rpm artifacts/ente-${{ github.ref_name }}-x86_64.rpm
+                  # APPIMAGE
+                  flutter_distributor package --platform=linux --targets=appimage --skip-clean
+                  mv dist/**/*-*-linux.AppImage artifacts/ente-${{ github.ref_name }}-x86_64.AppImage
+                  # DEB
                   flutter_distributor package --platform=linux --targets=deb --skip-clean
                   mv dist/**/*-*-linux.deb artifacts/ente-${{ github.ref_name }}-x86_64.deb
-              env:
-                  LIBSODIUM_USE_PKGCONFIG: 1
 
-            - name: Generate checksums and push to artifacts
-              run: |
-                  sha256sum artifacts/ente-* > artifacts/sha256sum-apk-deb
+            - name: Generate checksums
+              run: sha256sum artifacts/ente-* >> artifacts/sha256sum-rpm-appimage
 
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
@@ -125,67 +134,6 @@ jobs:
                   releaseFiles: auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
 
-    build-fedora-etc:
-        runs-on: ubuntu-latest
-
-        defaults:
-            run:
-                working-directory: auth
-
-        steps:
-            - name: Checkout code and submodules
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Install Flutter ${{ env.FLUTTER_VERSION  }}
-              uses: subosito/flutter-action@v2
-              with:
-                  channel: "stable"
-                  flutter-version: ${{ env.FLUTTER_VERSION  }}
-                  cache: true
-
-            - name: Create artifacts directory
-              run: mkdir artifacts
-
-            - name: Install dependencies for desktop build
-              run: |
-                  sudo apt-get update -y
-                  sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff6 xz-utils libarchive-tools libcurl4-openssl-dev
-                  sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
-
-            - name: Install appimagetool
-              run: |
-                  wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
-                  chmod +x appimagetool
-                  mv appimagetool /usr/local/bin/
-
-            - name: Build desktop app
-              run: |
-                  flutter config --enable-linux-desktop
-                  # dart pub global activate flutter_distributor
-                  dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor
-                  # Run below command if it is a beta or nightly
-                  if [[ ${{ github.ref }} =~ beta|nightly ]]; then
-                    flutter_distributor package --platform=linux --targets=pacman --skip-clean
-                    mv dist/**/*-*-linux.pacman artifacts/ente-${{ github.ref_name }}-x86_64.pacman
-                  fi
-                  flutter_distributor package --platform=linux --targets=rpm --skip-clean
-                  mv dist/**/*-*-linux.rpm artifacts/ente-${{ github.ref_name }}-x86_64.rpm
-                  flutter_distributor package --platform=linux --targets=appimage --skip-clean
-                  mv dist/**/*-*-linux.AppImage artifacts/ente-${{ github.ref_name }}-x86_64.AppImage
-
-            - name: Generate checksums
-              run: sha256sum artifacts/ente-* >> artifacts/sha256sum-rpm-appimage
-
-            - name: Create a draft GitHub release
-              uses: ncipollo/release-action@v1
-              with:
-                  artifacts: "auth/artifacts/*"
-                  draft: true
-                  allowUpdates: true
-                  updateOnlyUnreleased: true
-
     build-windows:
         runs-on: windows-latest
 
@@ -213,7 +161,7 @@ jobs:
               run: |
                   flutter config --enable-windows-desktop
                   # dart pub global activate flutter_distributor
-                  dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor
+                  dart pub global activate --source git https://github.com/ente-io/flutter_distributor_fork --git-ref develop --git-path packages/flutter_distributor
                   make innoinstall
                   flutter_distributor package --platform=windows --targets=exe --skip-clean
                   mv dist/**/*-windows-setup.exe artifacts/ente-${{ github.ref_name }}-installer.exe

.github/workflows/server-publish-ghcr.yml

@@ -36,6 +36,6 @@ jobs:
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Update branch server/ghcr to point to source commit
+            - name: Update branch ghcr/server to point to source commit
               run: |
-                  git push -f origin HEAD:refs/heads/server/ghcr
+                  git push -f origin HEAD:refs/heads/ghcr/server

.github/workflows/web-deploy-one.yml

@@ -26,8 +26,6 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4

.github/workflows/web-deploy-preview.yml

@@ -26,8 +26,6 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4

.github/workflows/web-deploy-staging.yml

@@ -34,7 +34,6 @@ jobs:
               uses: actions/checkout@v4
               with:
                   ref: ${{ steps.select-branch.outputs.branch }}
-                  submodules: recursive
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4

.github/workflows/web-deploy.yml

@@ -30,8 +30,6 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4

.github/workflows/web-publish-ghcr.yml

@@ -0,0 +1,34 @@
+name: "Publish ghcr (web)"
+
+on:
+    # Run automatically every Wednesday, at 07:00 UTC.
+    schedule:
+        - cron: '0 7 * * 3'
+    # Run manually if needed to publish out of schedule.
+    workflow_dispatch:
+
+jobs:
+    publish:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Build and push
+              uses: mr-smithers-excellent/docker-build-push@v6
+              with:
+                  dockerfile: web/Dockerfile
+                  directory: web
+                  # Resultant package name will be ghcr.io/ente-io/web
+                  image: web
+                  registry: ghcr.io
+                  enableBuildKit: true
+                  multiPlatform: true
+                  platform: linux/amd64,linux/arm64
+                  tags: ${{ github.sha }}, latest
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Update branch ghcr/web to point to source commit
+              run: |
+                  git push -f origin HEAD:refs/heads/ghcr/web

.gitmodules

@@ -9,7 +9,6 @@
 [submodule "auth/assets/simple-icons"]
 	path = auth/assets/simple-icons
 	url = https://github.com/simple-icons/simple-icons.git
-[submodule "web/apps/photos/thirdparty/photoswipe"]
-	path = web/apps/photos/thirdparty/photoswipe
-	url = https://github.com/ente-io/PhotoSwipe.git
-	branch = single-thread
+[submodule "mobile/thirdparty/flutter"]
+	path = mobile/thirdparty/flutter
+	url = https://github.com/flutter/flutter.git

README.md

@@ -95,8 +95,8 @@ please see our [support guide](SUPPORT.md).
 <img src=".github/assets/ente-ducky.png" width=200 alt="Ente's Mascot, Ducky,
     inviting people to Ente's source code repository" />
 
-Please visit our [community page](https://ente.io/community) for all the ways to
-connect with the community.
+Please visit the [community section](https://ente.io/about#community) for all the ways to
+connect with our community.
 
 [![Discord](https://img.shields.io/discord/948937918347608085?style=for-the-badge&logo=Discord&logoColor=white&label=Discord)](https://discord.gg/z2YVKkycX3)
 [![Ente's Blog RSS](https://img.shields.io/badge/blog-rss-F88900?style=for-the-badge&logo=rss&logoColor=white)](https://ente.io/blog/rss.xml)

auth/assets/custom-icons/_data/custom-icons.json

@@ -208,6 +208,10 @@
     {
       "title": "Bugzilla"
     },
+    {
+      "title": "ButterflyMX",
+      "slug": "butterflymx"
+    },
     {
       "title": "Bybit"
     },
@@ -306,6 +310,9 @@
     {
       "title": "Discourse"
     },
+    {
+      "title": "Deloitte"
+    },
     {
       "title": "DMarket"
     },
@@ -372,6 +379,14 @@
     {
       "title": "Fastmail"
     },
+    {
+      "title": "Federal Student Aid",
+      "slug": "federal_student_aid",
+      "altNames": [
+        "FSA",
+        "FAFSA"
+      ]
+    },
     {
       "title": "Fidelity",
       "slug": "fidelity",
@@ -393,9 +408,17 @@
     {
       "title": "ForUsAll"
     },
+    {
+      "title": "FreeTaxUSA",
+      "slug": "freetaxusa"
+    },
     {
       "title": "G2A"
     },
+    {
+      "title": "Gate.io",
+      "slug": "gateio.svg"
+    },
     {
       "title": "GitHub"
     },
@@ -468,6 +491,9 @@
       "title": "IceDrive",
       "slug": "ice_drive"
     },
+    {
+      "title": "ICONOMI"
+    },
     {
       "title": "ID.me",
       "slug": "id_me"
@@ -578,6 +604,11 @@
     {
       "title": "Letterboxd"
     },
+    {
+      "title": "LinkedIn",
+      "slug": "linkedin",
+      "hex": "2596be"
+    },
     {
       "title": "Linux.Do",
       "slug": "linux_do",
@@ -599,6 +630,14 @@
       "title": "Login.gov",
       "slug": "login_gov"
     },
+    {
+      "title": "Luma",
+      "slug": "luma",
+      "altNames": [
+        "luma",
+        "lu.ma"
+      ]
+    },
     {
       "title": "Marketplace.tf",
       "slug": "marketplacedottf"
@@ -628,6 +667,9 @@
         "MercadoLivre"
       ]
     },
+    {
+      "title": "MEXC"
+    },
     {
       "title": "microsoft"
     },
@@ -734,7 +776,8 @@
     {
       "title": "nintendo",
       "altNames": [
-        "任天堂"
+        "任天堂",
+        "Nintendo Account"
       ]
     },
     {
@@ -751,6 +794,15 @@
     {
       "title": "Notesnook"
     },
+    {
+      "title": "NoIp",
+      "slug": "noip",
+      "altNames": [
+        "No IP",
+        "No-IP",
+        "noip.com"
+      ]
+    },
     {
       "title": "Notion"
     },
@@ -836,6 +888,13 @@
         "PostScanMail"
       ]
     },
+    {
+      "title": "Prey Project",
+      "slug": "prey_project",
+      "altNames": [
+        "PreyProject"
+      ]
+    },
     {
       "title": "Privacy Guides",
       "slug": "privacyguides"
@@ -920,6 +979,10 @@
     {
       "title": "RuneMate"
     },
+    {
+      "title": "RuneScape Wiki",
+      "slug": "runescape_wiki"
+    },
     {
       "title": "Rust Language Forum",
       "slug": "rust_language_forum",
@@ -1169,6 +1232,9 @@
     {
       "title": "Wolvesville"
     },
+    {
+      "title": "Workflowy"
+    },
     {
       "title": "WorkOS",
       "altNames": [
@@ -1210,6 +1276,12 @@
     },
     {
       "title": "Zoom"
+    },
+    {
+      "title": "BingX"
+    },
+    {
+      "title": "CoinSpot"
     }
   ]
 }

auth/assets/custom-icons/icons/bingx.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 150 150"><defs><style>.e{fill:#2a54ff;}.f{fill:url(#d);}.g{fill:none;}</style><linearGradient id="d" x1="17.68" y1="116.45" x2="132.14" y2="32.11" gradientTransform="matrix(1, 0, 0, 1, 0, 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2a54ff"/><stop offset=".52" stop-color="#2143cb"/><stop offset="1" stop-color="#2a54ff"/></linearGradient></defs><g id="b"><path id="c" class="g" d="M0,0H150V150H0V0Z"/></g><path class="f" d="M140.2,22.33c-25.18-.09-49.79,10.83-66.63,29.47-6.06,6.27-10.1,13.95-14.96,21.06-11.64,15.93-29.81,25.14-49.5,25.13h0v28.65h0c25.17,.1,49.78-10.86,66.63-29.5,6.03-6.27,10.13-13.94,14.96-21.06,11.64-15.91,29.81-25.12,49.5-25.11V22.33h0Z"/><path class="e" d="M140.2,97.99c-19.68,0-37.86-9.2-49.5-25.11-4.81-7.12-8.92-14.78-14.94-21.06C58.95,33.18,34.3,22.24,9.13,22.35h0v28.65h0c21.8-.11,42.05,11.62,53.01,30.46,3.22,5.62,7.06,10.9,11.45,15.74,16.83,18.63,41.46,29.59,66.63,29.5l-.02-28.7h0Z"/></svg>

auth/assets/custom-icons/icons/butterflymx.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="462px" height="404px" viewBox="0 0 462 404" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="464.529999" y1="-2595.189941" x2="1224.150024" y2="-2986.919922" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0" style="stop-color:rgb(100%,92.156863%,18.039216%);stop-opacity:1;"/>
+<stop offset="0.92" style="stop-color:rgb(99.607843%,56.470591%,18.82353%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="-580.880005" y1="-2987.179932" x2="121.110001" y2="-2623.179932" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0.06" style="stop-color:rgb(0%,40.784314%,89.803922%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(3.921569%,85.09804%,100%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="1063.689941" y1="-3644.949951" x2="436.269989" y2="-3207.530029" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0" style="stop-color:rgb(93.725491%,3.921569%,21.176471%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(100%,59.215689%,54.11765%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="-389.76001" y1="-3622.02002" x2="266.369995" y2="-3164.639893" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0" style="stop-color:rgb(47.450981%,7.843138%,93.725491%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(85.882354%,41.176471%,100%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 437.566406 160.457031 C 437.566406 192.628906 411.488281 218.730469 379.324219 218.730469 L 239.71875 218.730469 C 239.71875 116.257812 317.625 31.976562 417.445312 21.886719 C 428.53125 20.769531 437.585938 29.886719 437.585938 41.027344 Z M 437.566406 160.457031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 24.640625 160.457031 C 24.640625 192.628906 50.722656 218.730469 82.882812 218.730469 L 222.492188 218.730469 C 222.492188 116.257812 144.589844 31.976562 44.777344 21.886719 C 33.695312 20.769531 24.640625 29.886719 24.640625 41.027344 Z M 24.640625 160.457031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 269.425781 338.792969 C 249.960938 308.039062 239.65625 272.375 239.71875 235.976562 L 381.667969 235.976562 C 412.507812 235.976562 437.574219 260.675781 437.574219 291.0625 C 437.566406 380.972656 317.730469 415.246094 269.425781 338.792969 Z M 269.425781 338.792969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear3);" d="M 192.78125 338.792969 C 212.25 308.039062 222.554688 272.375 222.492188 235.976562 L 80.546875 235.976562 C 49.707031 235.976562 24.640625 260.675781 24.640625 291.0625 C 24.640625 380.972656 144.480469 415.246094 192.78125 338.792969 Z M 192.78125 338.792969 "/>
+</g>
+</svg>

auth/assets/custom-icons/icons/coinspot.svg

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<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 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#C5C8CA;}
+	.st1{fill:#9DA4A8;}
+	.st2{fill:#B7BBBD;}
+	.st3{fill:#CBCFD1;}
+	.st4{fill:#BBBFC2;}
+	.st5{fill:#CACDCE;}
+	.st6{fill:#BFC3C5;}
+	.st7{fill:#BCC0C2;}
+	.st8{fill:#BDC1C4;}
+	.st9{fill:#C7CACC;}
+	.st10{fill:url(#SVGID_1_);}
+	.st11{fill:#FFFFFF;}
+	.st12{fill:#B8BCBF;}
+	.st13{fill:#C4C7C9;}
+	.st14{fill:#C1C5C7;}
+	.st15{fill:url(#SVGID_00000003093454306001190100000011813141018663887528_);}
+	.st16{fill:url(#SVGID_00000017503418065689336600000007511615486600436881_);}
+	.st17{fill:url(#SVGID_00000057845154053127761930000017803385842445649033_);}
+	.st18{fill:url(#SVGID_00000156571711195124538550000006687723982713171592_);}
+	.st19{fill:#DF3030;}
+	.st20{fill:url(#SVGID_00000001636660173574603980000008731795684331757470_);}
+	.st21{fill:#17181C;}
+	.st22{fill:url(#SVGID_00000180343933242210086490000003762167186865041053_);}
+	.st23{fill:url(#SVGID_00000015338415700440354440000005681408021599925436_);}
+</style>
+<g>
+	<path class="st0" d="M14.4,29.5c0.1,0,0.1,0,0.2,0c0.1,0,0.2,0,0.2,0H14.4z"/>
+	<path class="st1" d="M15.3,29.5h0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0L15.3,29.5
+		C15.2,29.5,15.3,29.5,15.3,29.5z"/>
+	<path class="st2" d="M15.3,29.5L15.3,29.5l-0.2,0C15.2,29.5,15.2,29.5,15.3,29.5z"/>
+	<path class="st3" d="M15.5,29.5L15.5,29.5L15.5,29.5L15.5,29.5L15.5,29.5z"/>
+	<path class="st0" d="M14.1,29.5c0.1,0,0.1,0,0.2,0H14.1z"/>
+	<path class="st4" d="M13.9,29.5C13.9,29.5,14,29.5,13.9,29.5c0.1,0,0.1,0,0.2,0H13.9z"/>
+	<path class="st5" d="M13.6,29.5C13.6,29.5,13.6,29.5,13.6,29.5c0.1,0,0.1,0,0.1,0H13.6z"/>
+	<path class="st6" d="M13.7,29.5C13.8,29.5,13.8,29.5,13.7,29.5c0.1,0,0.1,0,0.1,0H13.7z"/>
+	<path class="st7" d="M13.3,29.4C13.3,29.4,13.3,29.4,13.3,29.4C13.4,29.4,13.4,29.4,13.3,29.4L13.3,29.4z"/>
+	<path class="st8" d="M13.4,29.5C13.4,29.4,13.5,29.4,13.4,29.5C13.5,29.4,13.5,29.4,13.4,29.5L13.4,29.5z"/>
+	<path class="st8" d="M13.1,29.4C13.1,29.4,13.1,29.4,13.1,29.4C13.1,29.4,13.1,29.4,13.1,29.4L13.1,29.4z"/>
+	<path class="st9" d="M13.2,29.4C13.2,29.4,13.2,29.4,13.2,29.4C13.2,29.4,13.2,29.4,13.2,29.4C13.2,29.4,13.2,29.4,13.2,29.4
+		C13.3,29.4,13.3,29.4,13.2,29.4L13.2,29.4z"/>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.8812" y1="-88.078" x2="8.2545" y2="-104.6955" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#020037"/>
+		<stop  offset="1" style="stop-color:#050F62"/>
+	</linearGradient>
+	<path class="st10" d="M15,0.4C11.1,0.4,7.5,2,4.7,4.7C2,7.4,0.5,11.1,0.5,15c0,1.7,0.3,3.4,0.9,5.1c0.3,0,0.5,0,0.8,0
+		c2.9,0,5.8,0.9,8.2,2.6c2.4,1.7,4.2,4.1,5.1,6.9c3.8-0.1,7.4-1.7,10-4.4c2.6-2.7,4.1-6.4,4.1-10.1c0-3.9-1.5-7.6-4.3-10.3
+		C22.6,2,18.9,0.4,15,0.4"/>
+	<path class="st11" d="M20.7,22.5C20.7,22.5,20.7,22.5,20.7,22.5L20.7,22.5c0,0.4,0.1,0.8,0.3,1c0.2,0.2,0.6,0.3,1,0.3c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c-0.4,0-0.7,0.1-1,0.3c-0.2,0.2-0.3,0.6-0.3,1c0,0,0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0c0-0.4-0.1-0.7-0.3-1c-0.2-0.2-0.6-0.3-1-0.3c0,0,0,0,0,0l0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0.4,0,0.7-0.1,1-0.3S20.7,22.9,20.7,22.5C20.7,22.5,20.7,22.5,20.7,22.5C20.7,22.5,20.7,22.5,20.7,22.5z"/>
+	<path class="st11" d="M6.9,15.5C6.9,15.5,6.9,15.5,6.9,15.5L6.9,15.5c0,0.4,0.1,0.8,0.3,1c0.2,0.2,0.6,0.3,1,0.3c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c-0.4,0-0.7,0.1-1,0.3c-0.2,0.2-0.3,0.6-0.3,1c0,0,0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0c0-0.4-0.1-0.7-0.3-1c-0.2-0.2-0.6-0.3-1-0.3c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0.4,0,0.7-0.1,1-0.3C6.8,16.2,6.9,15.9,6.9,15.5C6.9,15.5,6.9,15.5,6.9,15.5C6.9,15.5,6.9,15.5,6.9,15.5z"/>
+	<path class="st11" d="M10.6,4.1L10.6,4.1C10.7,4.1,10.7,4.1,10.6,4.1c0,0.3,0.1,0.5,0.3,0.7c0.2,0.2,0.4,0.3,0.7,0.2h0v0l0,0l0,0
+		l0,0l0,0c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.2-0.3,0.4-0.2,0.7l0,0l0,0l0,0l0,0h0v0c0-0.3-0.1-0.5-0.2-0.7C10.2,5.1,10,5,9.7,5.1h0v0v0
+		h0C10,5,10.2,5,10.4,4.8C10.6,4.6,10.7,4.3,10.6,4.1C10.6,4.1,10.6,4.1,10.6,4.1C10.6,4.1,10.6,4.1,10.6,4.1z"/>
+	<path class="st12" d="M12.8,29.4C12.8,29.4,12.8,29.4,12.8,29.4C12.8,29.4,12.8,29.4,12.8,29.4C12.8,29.4,12.8,29.4,12.8,29.4
+		C12.8,29.4,12.8,29.4,12.8,29.4L12.8,29.4z"/>
+	<path class="st13" d="M13,29.4C13,29.4,13,29.4,13,29.4C13,29.4,13,29.4,13,29.4L13,29.4z"/>
+	<path class="st14" d="M12.9,29.4C12.9,29.4,12.9,29.4,12.9,29.4C12.9,29.4,12.9,29.4,12.9,29.4L12.9,29.4z"/>
+	
+		<linearGradient id="SVGID_00000173122186048074043340000017421439166240502921_" gradientUnits="userSpaceOnUse" x1="19.2457" y1="-89.3156" x2="22.9553" y2="-91.7188" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#E5E5E5"/>
+		<stop  offset="1" style="stop-color:#B7B8C1"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000173122186048074043340000017421439166240502921_);" d="M21.8,1.2c-1.4,0.7-3,1.9-4.4,4.2
+		c-2.5,3.9-3.2,7.4-3.2,7.4L16,14l0.3,0.2l1.9,1.2c0,0,2.9-2,5.4-5.9c1.5-2.3,2-4.3,2-5.8c-0.8-0.1-1.5-0.4-2.2-0.8
+		C22.8,2.5,22.2,1.9,21.8,1.2z"/>
+	
+		<linearGradient id="SVGID_00000127763695479642710240000017533313096818365313_" gradientUnits="userSpaceOnUse" x1="21.2378" y1="-99.9826" x2="19.0472" y2="-97.8815" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#EC4F4F"/>
+		<stop  offset="1" style="stop-color:#A91919"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000127763695479642710240000017533313096818365313_);" d="M20.8,16.8c0.9-1.4,0.3-3.2,0-3.8
+		c-0.7,0.8-1.5,1.5-2.3,2.1c0.1,0.4,0.3,0.8,0.3,1.2c0,0.1,0,0.2-0.1,0.3c-0.4,0.6-0.8,1.3-1.1,2c-0.1,0.1-0.1,0.2-0.1,0.3
+		c-0.1,0.2-0.1,0.3,0,0.5c0,0.3,0.2,0.5,0.3,0.8c0,0,0.1,0.1,0.1,0.1c0.1,0,0.1,0.1,0.2,0.1s0.1,0,0.2-0.1c0.1-0.1,0.3-0.2,0.4-0.4
+		C19.5,19,19.8,18.5,20.8,16.8z"/>
+	
+		<linearGradient id="SVGID_00000060717637781723915790000002744012061535479481_" gradientUnits="userSpaceOnUse" x1="11.3158" y1="-99.2586" x2="14.8122" y2="-101.5237" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#F2A518"/>
+		<stop  offset="1" style="stop-color:#F4E23E"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000060717637781723915790000002744012061535479481_);" d="M15.1,15.7l-1.7-1.1c-2,3.1-3.3,7-2.4,7.5
+		c0.9,0.6,3.9-2.2,5.9-5.3L15.1,15.7z"/>
+	
+		<linearGradient id="SVGID_00000070084874335106853820000008402293642909580433_" gradientUnits="userSpaceOnUse" x1="-4386.2534" y1="747.6443" x2="-4497.9517" y2="769.0099" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#EC4F4F"/>
+		<stop  offset="1" style="stop-color:#A91919"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000070084874335106853820000008402293642909580433_);" d="M15.2,9.5c-0.7-0.1-2.5,0.1-3.4,1.5
+		c-1.1,1.6-1.5,2.1-2,3.2c-0.1,0.2-0.1,0.3-0.2,0.5c0,0.1,0,0.1,0,0.2C9.6,15,9.7,15,9.7,15c0,0,0.1,0,0.2,0.1c0.3,0.1,0.6,0,0.8,0
+		c0.2,0,0.3-0.1,0.4-0.2c0.1-0.1,0.2-0.2,0.3-0.3c0.5-0.6,0.9-1.2,1.3-1.8c0.1-0.1,0.2-0.2,0.3-0.2c0.4-0.1,0.8-0.1,1.2-0.2l0,0
+		C14.5,11.4,14.8,10.4,15.2,9.5z"/>
+	<path class="st19" d="M25,0.6c-0.2-0.1-1.5-0.2-3.2,0.7c0.4,0.7,1,1.2,1.6,1.7c0.7,0.4,1.4,0.7,2.2,0.8C25.7,1.9,25.1,0.7,25,0.6z"
+		/>
+	<path class="st19" d="M18.4,15.5L14,12.7c-0.1,0-0.1,0-0.2,0l-0.9,1.4c0,0.1,0,0.1,0,0.2l4.4,2.8c0.1,0,0.1,0,0.2,0l0.9-1.4
+		C18.4,15.6,18.4,15.6,18.4,15.5z"/>
+	
+		<linearGradient id="SVGID_00000044894753735506851200000013592864944465274029_" gradientUnits="userSpaceOnUse" x1="14.9436" y1="-95.9217" x2="16.3716" y2="-96.8468" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#B71E1E"/>
+		<stop  offset="0.44" style="stop-color:#DF3030"/>
+		<stop  offset="1" style="stop-color:#C51D1D"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000044894753735506851200000013592864944465274029_);" d="M17.8,11.6c-0.4-0.2-2.1,1.6-3.2,3.3
+		c-0.8,1.2-1.4,3-1.1,3.2c0.4,0.2,1.7-1,2.5-2.3C17.1,14.2,18.1,11.9,17.8,11.6z"/>
+	<path class="st21" d="M21.2,8.6c1.3,0,2.3-1,2.3-2.3s-1-2.3-2.3-2.3c-1.3,0-2.3,1-2.3,2.3S20,8.6,21.2,8.6z"/>
+	
+		<linearGradient id="SVGID_00000090987122570624474440000002432161440392897685_" gradientUnits="userSpaceOnUse" x1="20.068" y1="-87.0655" x2="22.3556" y2="-88.5473" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#CED1EC"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000090987122570624474440000002432161440392897685_);" d="M21.2,7.7c0.8,0,1.4-0.6,1.4-1.4
+		S22,5,21.2,5c-0.8,0-1.4,0.6-1.4,1.4S20.5,7.7,21.2,7.7z"/>
+	
+		<linearGradient id="SVGID_00000044151119195171880090000016489263670362291109_" gradientUnits="userSpaceOnUse" x1="14.4192" y1="-110.4727" x2="2.0973" y2="-101.7197" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#B7B7BD"/>
+		<stop  offset="0.68" style="stop-color:#EFEFEF"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000044151119195171880090000016489263670362291109_);" d="M2.1,20c-0.3,0-0.5,0-0.8,0
+		c1,2.8,2.9,5.2,5.3,6.9s5.3,2.6,8.3,2.6c0.1,0,0.3,0,0.4,0c-0.9-2.8-2.7-5.2-5.1-6.9C7.9,20.9,5.1,20,2.1,20z"/>
+</g>
+</svg>

auth/assets/custom-icons/icons/deloitte.svg

@@ -0,0 +1,15 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1545 1333" width="1545" height="1333">
+	<title>Deloitte-svg</title>
+	<style>
+		.s0 { fill: #86bc24 } 
+		.s1 { fill: #0f0b0b } 
+	</style>
+	<g id="layer1">
+		<g id="g3359">
+			<g id="g3371">
+				<path id="path3356" class="s0" d="m1354.4 1332.5c-105.1 0-190-84.8-190-189.6 0-104.9 84.9-189.6 190-189.6 105 0 189.9 84.7 189.9 189.6 0 104.8-84.9 189.6-189.9 189.6z"/>
+				<path id="path3360" fill-rule="evenodd" class="s1" d="m1089.4 628.2q0 328.2-176.7 505.8-176.8 177.6-497.1 177.6h-414.9v-1311.1h443.9q308.8 0 476.8 161.4c112 107.6 168 263 168 466.3zm-359.7 12.5q0-180.1-69.7-267.2c-46.6-58-117.1-87-211.9-87h-100.9v734.5h77.2c105.3 0 182.5-31.2 231.6-93.8 49.1-62.4 73.7-157.9 73.7-286.5z"/>
+			</g>
+		</g>
+	</g>
+</svg>

auth/assets/custom-icons/icons/freetaxusa.svg

@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 560 400" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(2.51518 0 0 2.51518 30 162.272)"><path d="m136.108 5.893 6.356 23.513h-4.7l-1.218-5.334h-6.587l-1.284 5.334h-4.545l6.52-23.513h5.468zm-2.833 4.107-2.436 10.242h4.806zm-65.8 1.7c2.02 0 3.508.522 4.463 1.563s1.432 2.674 1.432 4.9v11.263h-3.95v-1.9c-.505.746-1.114 1.323-1.828 1.73-.706.405-1.508.615-2.322.61-1.405 0-2.502-.45-3.294-1.35s-1.176-2.182-1.176-3.786c0-1.734.577-3.1 1.73-4.1s2.804-1.586 4.956-1.762l1.78-.132v-1.02c0-1.03-.153-1.788-.462-2.27s-.8-.725-1.482-.725c-.615 0-1.086.187-1.415.56s-.56.966-.7 1.78l-3.887-.33c.264-1.713.9-2.98 1.9-3.804s2.427-1.235 4.25-1.235zm1.78 9.78-1.317.132c-.988.088-1.752.373-2.3.856s-.808 1.13-.808 1.943c0 .724.153 1.28.463 1.662s.756.577 1.35.577c.748.022 1.459-.331 1.894-.939.472-.626.708-1.476.708-2.553v-1.68zm-25.26-9.78c2.064 0 3.617.714 4.66 2.14s1.563 3.535 1.563 6.323v1.68h-8.825c.044 3.338.9 5.005 2.536 5.005.66 0 1.152-.202 1.482-.608s.548-1.092.66-2.06h4.084c-.177 1.888-.797 3.322-1.86 4.298s-2.542 1.465-4.43 1.465c-2.282 0-3.972-.73-5.07-2.2s-1.647-3.716-1.647-6.768c0-3.03.58-5.334 1.745-6.915s2.869-2.36 5.107-2.36zm-.133 3.03c-.8 0-1.372.346-1.744 1.038s-.604 1.84-.7 3.442h4.676c0-1.56-.18-2.695-.544-3.4s-.927-1.07-1.696-1.07zm-14.29-3.03c2.064 0 3.617.714 4.66 2.14s1.563 3.535 1.563 6.323v1.68h-8.825c.044 3.338.9 5.005 2.536 5.005.66 0 1.152-.202 1.482-.608s.55-1.092.66-2.06h4.084c-.177 1.888-.797 3.322-1.86 4.298s-2.542 1.465-4.43 1.465c-2.282 0-3.972-.73-5.07-2.2s-1.647-3.716-1.647-6.768c0-3.03.58-5.334 1.745-6.915s2.867-2.37 5.105-2.37zm-.133 3.03c-.8 0-1.372.346-1.744 1.038s-.604 1.84-.7 3.442h4.676c0-1.56-.18-2.695-.544-3.4s-.927-1.07-1.696-1.07zm-29.439-8.8v23.513h4.645v-9.55h7.3v-4.15h-7.3v-5.665h7.837v-4.148zm13.7 23.477v-17.2h4.215v2.306c.46-.834 1-1.477 1.647-1.927s1.305-.675 2-.675c.352 0 .747.054 1.185.165l-.493 3.952c-.33-.087-.757-.132-1.285-.132-.792-.018-1.554.306-2.09.89-.56.594-.84 1.33-.84 2.206v10.406h-4.339zm39.813 0v-19.364h-5.335v-4.15h15.315v4.15h-5.336v19.365zm30.792 0-2.832-5.665-2.7 5.665h-4.28l4.84-8.727-4.545-8.464h4.6l2.47 5.204 2.536-5.204h4.282l-4.676 8.234 4.908 8.957zm17.652-23.514h4.644v15.083c0 2.92-.68 5.155-2.04 6.702s-3.328 2.322-5.897 2.322-4.533-.773-5.896-2.322-2.04-3.78-2.04-6.702v-15.083h4.644v15.413c0 1.537.27 2.68.807 3.424s1.366 1.12 2.486 1.12 1.948-.373 2.487-1.12.807-1.887.807-3.424v-15.413zm12.118 13.14c-1.865-.548-3.237-1.377-4.116-2.486s-1.318-2.564-1.318-4.364c0-2.085.682-3.754 2.042-5.005s3.163-1.878 5.4-1.878c2.13 0 3.788.538 4.973 1.614s1.93 2.733 2.24 4.972l-4.414.594c-.22-1.23-.548-2.103-.987-2.62s-1.087-.774-1.943-.774-1.515.247-1.977.74-.7 1.224-.7 2.2c0 .813.175 1.444.527 1.894s.955.806 1.812 1.07l2.503.8c1.338.418 2.415.94 3.227 1.564.783.594 1.397 1.384 1.78 2.29.376.9.56 1.977.56 3.228 0 2.196-.675 3.936-2.025 5.22s-3.179 1.908-5.507 1.908c-4.897 0-7.5-2.547-7.84-7.64h4.612c.1 1.34.422 2.316.938 2.93s1.3.922 2.355.922c.9 0 1.597-.27 2.1-.807s.74-1.312.74-2.322c0-.9-.203-1.614-.6-2.14s-1.048-.92-1.926-1.185l-2.438-.724z" fill="#212f63"/><path d="m140.638 5.893 1.207 4.25h49.07v-4.25zm2.7 9.463 1.213 4.25 46.373-.007v-4.25zm2.79 9.802 1.208 4.25h43.6v-4.25z" fill="#bf2032"/><path d="m195.992 2.462h.33c.364 0 .546-.143.546-.432.005-.113-.036-.223-.115-.304-.076-.076-.212-.115-.406-.115h-.354v.85zm-.52 1.295v-2.577h.964c.27 0 .502.06.698.183s.29.336.29.64c0 .153-.042.294-.126.425s-.2.223-.343.273l.584 1.053h-.584l-.444-.89h-.52v.89h-.52zm.913.774c.255.001.508-.049.743-.147.232-.097.433-.234.6-.412.174-.185.31-.402.4-.64.1-.265.15-.547.147-.831.002-.28-.048-.558-.147-.819-.098-.25-.23-.465-.4-.648-.169-.181-.374-.326-.601-.425-.234-.1-.48-.153-.743-.153-.257-.002-.512.05-.748.153-.224.099-.426.244-.591.425-.169.191-.302.41-.394.648-.097.25-.145.522-.145.82-.004.284.046.565.145.831.098.25.23.462.394.64s.363.316.59.412c.237.1.491.15.748.147zm0 .47c-.318.003-.634-.06-.927-.184-.288-.122-.538-.293-.754-.514-.221-.227-.396-.494-.515-.787-.127-.304-.19-.643-.19-1.015s.062-.71.19-1.016c.12-.293.295-.56.515-.787.215-.22.471-.394.754-.514.288-.123.596-.184.927-.184.32-.002.637.061.933.184.293.123.545.293.76.514s.388.483.515.787.2.643.2 1.016-.063.71-.2 1.015-.298.568-.515.787-.468.392-.76.514c-.295.124-.613.186-.933.184z" fill="#212f63"/></g></svg>

auth/assets/custom-icons/icons/gateio.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xodm="http://www.corel.com/coreldraw/odm/2003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 2500 2500" style="enable-background:new 0 0 2500 2500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#2354E6;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#17E6A1;}
+</style>
+<g id="Layer_x0020_1">
+	<rect y="0" class="st0" width="2500" height="2500"></rect>
+	<g id="_2500576017504">
+		<path id="Fill-3" class="st1" d="M1250,1937.5c-379.7,0-687.5-307.8-687.5-687.5c0-379.7,307.8-687.5,687.5-687.5V0    C559.6,0,0,559.6,0,1250c0,690.3,559.6,1250,1250,1250c690.3,0,1250-559.6,1250-1250h-562.5    C1937.5,1629.7,1629.7,1937.5,1250,1937.5z"></path>
+		<polygon id="Fill-4" class="st2" points="1250,1250 1937.5,1250 1937.5,562.5 1250,562.5   "></polygon>
+	</g>
+</g>
+</svg>

auth/assets/custom-icons/icons/iconomi.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 35 30" version="1.1" style="zoom: 16;" visibility="visible"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" visibility="visible"><g id="Group-8"><g id="Group-7" fill="#3A79F2"><rect id="Rectangle-Copy-20" x="9" y="0" width="6" height="30" rx="3"></rect><rect id="Rectangle-Copy-21" x="27" y="12" width="6" height="9" rx="3"></rect><rect id="Rectangle-Copy-22" x="18" y="12" width="6" height="18" rx="3" visibility="visible"></rect><rect id="Rectangle-Copy-23" x="0" y="21" width="6" height="9" rx="3" visibility="visible"></rect><circle id="Oval-Copy-13" cx="21" cy="6" r="3" visibility="visible"></circle></g></g></g></svg>

auth/assets/custom-icons/icons/linkedin.svg

@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg height="72" viewBox="0 0 72 72" width="72" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M8,72 L64,72 C68.418278,72 72,68.418278 72,64 L72,8 C72,3.581722 68.418278,-8.11624501e-16 64,0 L8,0 C3.581722,8.11624501e-16 -5.41083001e-16,3.581722 0,8 L0,64 C5.41083001e-16,68.418278 3.581722,72 8,72 Z" fill="#007EBB"/><path d="M62,62 L51.315625,62 L51.315625,43.8021149 C51.315625,38.8127542 49.4197917,36.0245323 45.4707031,36.0245323 C41.1746094,36.0245323 38.9300781,38.9261103 38.9300781,43.8021149 L38.9300781,62 L28.6333333,62 L28.6333333,27.3333333 L38.9300781,27.3333333 L38.9300781,32.0029283 C38.9300781,32.0029283 42.0260417,26.2742151 49.3825521,26.2742151 C56.7356771,26.2742151 62,30.7644705 62,40.051212 L62,62 Z M16.349349,22.7940133 C12.8420573,22.7940133 10,19.9296567 10,16.3970067 C10,12.8643566 12.8420573,10 16.349349,10 C19.8566406,10 22.6970052,12.8643566 22.6970052,16.3970067 C22.6970052,19.9296567 19.8566406,22.7940133 16.349349,22.7940133 Z M11.0325521,62 L21.769401,62 L21.769401,27.3333333 L11.0325521,27.3333333 L11.0325521,62 Z" fill="#FFF"/></g></svg>

auth/assets/custom-icons/icons/luma.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 724 264">
+    <path
+        d="M38.53 260.65H.43V27.86h38.1zm86.46 2.77c-42.25 0-66.48-22.96-66.48-63V89.33h38.1v108.28c0 23.61 8.7 32.39 32.12 32.39 30.35 0 42.73-14.54 42.73-50.17v-90.5h38.1v171.33h-36.54v-29.91c-4.99 22.98-27.12 32.67-48.03 32.67zm347.2-2.77H434.4V149.87c0-22.5-7.01-30.87-25.88-30.87-24.28 0-37.11 14.45-37.11 41.79v99.86h-37.79V149.87c0-21.93-7.23-30.87-24.94-30.87-31.59 0-38.05 32.96-38.05 41.79v99.86h-38.1V89.33h36.54v29.96c6.49-21.02 27.02-33.71 47.72-33.71 20.69 0 38.09 7.9 45.64 33.71 10.13-26.76 28.35-33.71 50.15-33.71 37.88 0 59.61 18.88 59.61 51.81v123.26h0zm76.65 2.77c-52.62 0-61.55-33.45-61.55-50.52 0-20.1 8.83-38.21 27.93-45.55 8.41-3.11 16.52-5.43 24.84-7.1 7.33-1.47 18.64-3.03 26.91-4.17l2.73-.38c14.38-2 29.67-9.21 29.67-18.62 0-16-20.51-18.39-32.74-18.39-13.87 0-23.64 3.57-27.53 10.05-3.49 6.46-3.73 7.97-4.62 13.6l-.62 4.43h-38.1l.68-5.61c1.35-11.14 3.41-19.03 6.48-24.83 10.54-20.39 31.77-30.75 63.08-30.75 26.11 0 44.63 8.23 53.26 15.94 5.31 4.6 9.1 9.84 11.89 16.46 5.84 12.36 6.32 20.63 6.32 29.4v86.43c0 8.07.78 14.97 2.31 20.5l1.76 6.35h-38.91l-.7-4.19c-.5-2.96-.67-19.75-.88-26.23-8.99 23.61-28.27 33.18-52.21 33.18zm50.53-93.72c-7.97 6.11-20.47 9.6-38.62 13.23-31.27 5.78-36.54 13.06-36.54 27.22 0 12.5 10.63 20.26 27.75 20.26 33.23 0 47.41-15.48 47.41-51.77v-8.94zm124.2-105.51C688.46 64.19 660 35.73 660 .62c0 35.11-28.46 63.57-63.57 63.57h0c35.11 0 63.57 28.46 63.57 63.57h0c0-35.11 28.46-63.57 63.57-63.57z" />
+</svg>

auth/assets/custom-icons/icons/mexc.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xodm="http://www.corel.com/coreldraw/odm/2003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 450 2500 1650" style="enable-background:new 0 0 2500 2500;" xml:space="preserve">
+    <rect y="250" width="2500" height="1650" style="fill:none;"></rect>
+    <g id="_2500406570000">
+        <path d="M2459.7,1566.6l-540.6-937.7c-118.5-195.5-407.5-197.5-521.9,8.3l-567.6,975.2c-106,178.8,25,403.3,237.1,403.3H2204C2418.1,2015.7,2578.2,1784.9,2459.7,1566.6z" style="fill:#3156AA;"></path>
+        <path d="M1680,1639.4l-33.3-58.2c-31.2-54.1-99.8-170.5-99.8-170.5l-457.4-794.3C971,439.7,690.3,425.1,571.8,647.6L39.5,1568.7c-110.2,193.4,20.8,444.9,259.9,447h1131.1h482.4h286.9C1906.7,2017.8,1813.1,1866,1680,1639.4L1680,1639.4z" style="fill:#1972E2;"></path>
+        
+        <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="703.637" y1="1211.6566" x2="1935.647" y2="727.2267" gradientTransform="matrix(1 0 0 -1 0 2497.8899)">
+            <stop offset="0" style="stop-color:#264CA2;stop-opacity:0;"></stop>
+            <stop offset="1" style="stop-color:#234588;"></stop>
+        </linearGradient>
+        
+        <path d="M1680.1,1639.4l-33.3-58.2c-31.2-54.1-99.8-170.5-99.8-170.5l-295.3-519.8l-424.2,723.6c-106,178.8,25,403.4,237,403.4h363.9h482.4h289C1904.6,2015.7,1813.1,1866,1680.1,1639.4L1680.1,1639.4z" style="fill:url(#SVGID_1_);"></path>
+    </g>
+</svg>

auth/assets/custom-icons/icons/noip.svg

@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="100%" viewBox="0 0 200 200" enable-background="new 0 0 200 200" xml:space="preserve">
+<path fill="#E9EAE8" opacity="1.000000" stroke="none" d=" M1.000001,121.000000   C1.000000,107.979103 1.000000,94.958214 1.330396,81.781845   C2.105629,80.808945 2.781408,80.039177 2.961370,79.167091   C6.970184,59.740398 16.508305,43.142090 30.377947,29.382053   C43.761433,16.104332 59.986267,7.182058 78.573097,2.942371   C79.482437,2.734949 80.195526,1.667158 81.000000,1.000001   C94.020897,1.000000 107.041786,1.000000 120.216652,1.335631   C126.713715,3.778750 133.179947,5.577904 139.376389,8.052591   C156.703827,14.972685 171.012131,25.956200 181.986893,41.089684   C190.099167,52.275986 196.134094,64.470306 199.117294,78.069069   C199.211044,78.496483 200.348892,78.694855 201.000000,79.000000   C201.000000,93.354225 201.000000,107.708458 200.669632,122.218155   C199.894424,123.189087 199.220856,123.956680 199.038727,124.827095   C195.802597,140.292557 188.666824,153.987869 178.511795,165.781891   C164.123367,182.492554 146.476486,194.499832 124.422401,199.082748   C123.840591,199.203659 123.469414,200.338181 123.000000,201.000000   C108.645775,201.000000 94.291542,201.000000 79.781174,200.674042   C78.977226,199.905136 78.385597,199.219894 77.673386,199.054794   C61.298405,195.258774 46.725803,187.667160 34.294682,176.602264   C18.003170,162.101318 7.102591,144.135208 2.914476,122.432388   C2.802733,121.853340 1.661271,121.473000 1.000001,121.000000  M162.957382,65.141830   C157.650208,70.691360 152.343033,76.240898 146.301605,81.755386   C145.732269,82.047028 145.042847,82.218056 144.611099,82.647896   C132.762451,94.444138 120.925987,106.252800 109.147583,118.119026   C108.427895,118.844093 108.202583,120.059868 107.093681,121.126122   C94.730469,133.412537 82.367249,145.698959 69.317253,158.025375   C62.966175,164.528809 56.615101,171.032227 49.973309,177.833344   C51.968117,178.908905 53.966496,179.986389 56.373127,181.619629   C60.931099,183.466125 65.489067,185.312622 70.530418,187.664200   C78.728378,189.429962 86.926338,191.195740 96.041878,193.048172   C135.589554,194.037872 165.346161,177.209564 183.339188,142.206635   C198.044006,113.600494 197.050034,84.312935 180.956207,55.283768   C179.868546,53.520458 178.780869,51.757149 177.222046,49.229988   C172.345459,54.885849 167.967255,59.963684 162.957382,65.141830  M108.466240,57.866222   C108.959000,57.471405 109.451752,57.076591 110.380226,56.193321   C112.081604,54.903320 113.950760,53.783173 115.456879,52.295490   C124.572472,43.291451 133.611420,34.209698 142.658142,25.136135   C143.883804,23.906826 145.009445,22.577780 146.408920,21.045849   C134.481003,14.180294 122.154709,10.443705 109.110474,9.413567   C92.088882,8.069327 75.690033,10.494845 59.889217,19.071775   C52.575058,24.411427 45.260902,29.751078 37.284908,35.186230   C4.630878,65.629463 1.719374,115.370926 21.645718,146.481766   C27.512495,140.245255 33.273243,134.121445 39.623917,127.697594   C47.726917,119.475052 55.829922,111.252510 64.624794,103.006409   C66.467079,100.992920 68.309372,98.979439 70.717163,96.651299   C82.356544,85.062904 94.022423,73.500809 105.590721,61.841888   C106.646294,60.778049 107.076263,59.093464 107.883652,57.776287   C107.883652,57.776287 107.786400,57.842323 108.466240,57.866222  z"/>
+<path fill="#ffffff" opacity="1.000000" stroke="none" d=" M80.531342,1.000001   C80.195526,1.667158 79.482437,2.734949 78.573097,2.942371   C59.986267,7.182058 43.761433,16.104332 30.377947,29.382053   C16.508305,43.142090 6.970184,59.740398 2.961370,79.167091   C2.781408,80.039177 2.105629,80.808945 1.330396,81.313187   C1.000000,54.406445 1.000000,27.812887 1.000000,1.000000   C27.353823,1.000000 53.708252,1.000000 80.531342,1.000001  z"/>
+<path fill="#ffffff" opacity="1.000000" stroke="none" d=" M201.000000,78.531342   C200.348892,78.694855 199.211044,78.496483 199.117294,78.069069   C196.134094,64.470306 190.099167,52.275986 181.986893,41.089684   C171.012131,25.956200 156.703827,14.972685 139.376389,8.052591   C133.179947,5.577904 126.713715,3.778750 120.685310,1.335631   C147.592621,1.000000 174.185257,1.000000 201.000000,1.000000   C201.000000,26.687134 201.000000,52.374908 201.000000,78.531342  z"/>
+<path fill="#ffffff" opacity="1.000000" stroke="none" d=" M1.000001,121.468658   C1.661271,121.473000 2.802733,121.853340 2.914476,122.432388   C7.102591,144.135208 18.003170,162.101318 34.294682,176.602264   C46.725803,187.667160 61.298405,195.258774 77.673386,199.054794   C78.385597,199.219894 78.977226,199.905136 79.312515,200.674042   C53.072189,201.000000 27.144375,201.000000 1.000000,201.000000   C1.000000,174.646164 1.000000,148.291748 1.000001,121.468658  z"/>
+<path fill="#ffffff" opacity="1.000000" stroke="none" d=" M123.468658,201.000000   C123.469414,200.338181 123.840591,199.203659 124.422401,199.082748   C146.476486,194.499832 164.123367,182.492554 178.511795,165.781891   C188.666824,153.987869 195.802597,140.292557 199.038727,124.827095   C199.220856,123.956680 199.894424,123.189087 200.669632,122.686813   C201.000000,148.926880 201.000000,174.853760 201.000000,201.000000   C175.312851,201.000000 149.625092,201.000000 123.468658,201.000000  z"/>
+<path fill="#90BF02" opacity="1.000000" stroke="none" d=" M70.151657,96.965950   C68.309372,98.979439 66.467079,100.992920 64.276588,102.547241   C63.928383,86.369431 63.928383,70.650787 63.928383,54.871948   C55.257160,54.871948 47.224957,54.871948 39.033997,54.871948   C39.033997,79.516510 39.033997,103.757080 39.033997,127.997643   C33.273243,134.121445 27.512495,140.245255 21.645718,146.481766   C1.719374,115.370926 4.630878,65.629463 37.719608,35.462364   C39.135883,36.852516 39.984581,38.130096 41.121098,39.053391   C47.414471,44.166069 58.368134,43.270470 63.330196,37.318970   C67.946770,31.781837 66.780022,24.056263 60.570244,19.044075   C75.690033,10.494845 92.088882,8.069327 109.110474,9.413567   C122.154709,10.443705 134.481003,14.180294 146.408920,21.045849   C145.009445,22.577780 143.883804,23.906826 142.658142,25.136135   C133.611420,34.209698 124.572472,43.291451 115.456879,52.295490   C113.950760,53.783173 112.081604,54.903320 109.848991,56.507885   C108.807304,57.162407 108.296852,57.502369 107.786400,57.842323   C107.786400,57.842323 107.883652,57.776287 107.499512,57.814442   C103.123413,60.609695 99.131447,63.366795 95.061790,66.177551   C94.532784,62.603703 94.002762,59.023003 93.451675,55.299969   C85.547775,55.299969 77.881607,55.299969 70.151657,55.299969   C70.151657,69.433502 70.151657,83.199722 70.151657,96.965950  z"/>
+<path fill="#90BE02" opacity="1.000000" stroke="none" d=" M181.064896,55.965897   C197.050034,84.312935 198.044006,113.600494 183.339188,142.206635   C165.346161,177.209564 135.589554,194.037872 95.558487,192.539490   C95.011642,175.365601 94.948189,158.700363 94.957329,141.656860   C95.029930,139.761459 95.029930,138.244339 95.029930,136.217133   C96.400269,137.088867 97.162216,137.573578 98.053833,138.371689   C101.904762,140.815338 105.425377,143.476242 109.385910,144.973618   C120.098732,149.023911 131.263062,149.217529 142.344849,146.892456   C159.790939,143.232071 172.455902,133.383316 177.684326,116.021088   C182.850937,98.864090 180.467819,82.760155 167.840240,68.827202   C167.809296,68.599007 167.711411,68.148964 168.030243,67.993683   C172.587692,63.880894 176.826294,59.923397 181.064896,55.965897  z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" d=" M39.328957,127.847618   C39.033997,103.757080 39.033997,79.516510 39.033997,54.871948   C47.224957,54.871948 55.257160,54.871948 63.928383,54.871948   C63.928383,70.650787 63.928383,86.369431 63.930653,102.559021   C55.829922,111.252510 47.726917,119.475052 39.328957,127.847618  z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" d=" M94.884727,142.035141   C94.948189,158.700363 95.011642,175.365601 95.099701,192.496170   C86.926338,191.195740 78.728378,189.429962 70.271156,186.931229   C69.954536,179.802521 69.897171,173.406799 69.921326,166.764832   C70.056465,166.354218 70.110100,166.189819 70.436935,165.848373   C78.768333,157.792603 86.826530,149.913879 94.884727,142.035141  z"/>
+<path fill="#FFFFFE" opacity="1.000000" stroke="none" d=" M70.434410,96.808624   C70.151657,83.199722 70.151657,69.433502 70.151657,55.299969   C77.881607,55.299969 85.547775,55.299969 93.451675,55.299969   C94.002762,59.023003 94.532784,62.603703 95.061790,66.177551   C99.131447,63.366795 103.123413,60.609695 107.456062,57.774864   C107.076263,59.093464 106.646294,60.778049 105.590721,61.841888   C94.022423,73.500809 82.356544,85.062904 70.434410,96.808624  z"/>
+<path fill="#FEFEFD" opacity="1.000000" stroke="none" d=" M60.229729,19.057926   C66.780022,24.056263 67.946770,31.781837 63.330196,37.318970   C58.368134,43.270470 47.414471,44.166069 41.121098,39.053391   C39.984581,38.130096 39.135883,36.852516 38.050526,35.414612   C45.260902,29.751078 52.575058,24.411427 60.229729,19.057926  z"/>
+<path fill="#E5E5E4" opacity="1.000000" stroke="none" d=" M94.957329,141.656860   C86.826530,149.913879 78.768333,157.792603 70.368210,165.406586   C70.018867,162.756363 70.011452,160.370865 70.004036,157.985382   C82.367249,145.698959 94.730469,133.412537 107.756348,121.164223   C109.639374,121.798706 110.859749,122.395088 112.115219,123.158279   C112.150314,123.325104 112.155739,123.666389 112.012955,123.992271   C107.221497,128.898193 102.572823,133.478241 97.924149,138.058289   C97.162216,137.573578 96.400269,137.088867 95.029930,136.217133   C95.029930,138.244339 95.029930,139.761459 94.957329,141.656860  z"/>
+<path fill="#81AB00" opacity="1.000000" stroke="none" d=" M112.080116,122.991463   C110.859749,122.395088 109.639374,121.798706 108.083130,121.124825   C108.202583,120.059868 108.427895,118.844093 109.147583,118.119026   C120.925987,106.252800 132.762451,94.444138 144.611099,82.647896   C145.042847,82.218056 145.732269,82.047028 146.827606,82.054634   C148.247528,83.549278 149.141449,84.744675 149.880432,86.239487   C138.292679,98.049911 126.875618,109.576714 115.395844,121.040718   C114.517334,121.918007 113.195747,122.351624 112.080116,122.991463  z"/>
+<path fill="#90BE03" opacity="1.000000" stroke="none" d=" M69.839813,167.011063   C69.897171,173.406799 69.954536,179.802521 70.029465,186.678680   C65.489067,185.312622 60.931099,183.466125 56.322063,181.041183   C60.793938,175.978851 65.316872,171.494949 69.839813,167.011063  z"/>
+<path fill="#82AC01" opacity="1.000000" stroke="none" d=" M69.921326,166.764832   C65.316872,171.494949 60.793938,175.978851 56.117935,180.763306   C53.966496,179.986389 51.968117,178.908905 49.973309,177.833344   C56.615101,171.032227 62.966175,164.528809 69.660645,158.005371   C70.011452,160.370865 70.018867,162.756363 70.095001,165.583633   C70.110100,166.189819 70.056465,166.354218 69.921326,166.764832  z"/>
+<path fill="#E3E4E0" opacity="1.000000" stroke="none" d=" M150.035370,85.940079   C149.141449,84.744675 148.247528,83.549278 147.194733,82.072159   C152.343033,76.240898 157.650208,70.691360 163.580933,65.209869   C165.373459,66.234924 166.542435,67.191940 167.711411,68.148964   C167.711411,68.148964 167.809296,68.599007 167.557053,68.983429   C161.830566,74.973953 156.356323,80.580055 150.670471,86.124481   C150.458832,86.062805 150.035370,85.940079 150.035370,85.940079  z"/>
+<path fill="#82AC02" opacity="1.000000" stroke="none" d=" M168.030243,67.993683   C166.542435,67.191940 165.373459,66.234924 163.896759,65.159714   C167.967255,59.963684 172.345459,54.885849 177.222046,49.229988   C178.780869,51.757149 179.868546,53.520458 181.010559,55.624832   C176.826294,59.923397 172.587692,63.880894 168.030243,67.993683  z"/>
+<path fill="#FFFFFE" opacity="1.000000" stroke="none" d=" M108.126320,57.854275   C108.296852,57.502369 108.807304,57.162407 109.631134,56.752113   C109.451752,57.076591 108.959000,57.471405 108.126320,57.854275  z"/>
+<path fill="#FEFEFC" opacity="1.000000" stroke="none" d=" M150.882095,86.186157   C156.356323,80.580055 161.830566,74.973953 167.587982,69.211624   C180.467819,82.760155 182.850937,98.864090 177.684326,116.021088   C172.455902,133.383316 159.790939,143.232071 142.344849,146.892456   C131.263062,149.217529 120.098732,149.023911 109.385910,144.973618   C105.425377,143.476242 101.904762,140.815338 98.053833,138.371689   C102.572823,133.478241 107.221497,128.898193 112.397583,124.067833   C114.508804,124.310890 116.064545,124.938728 117.680908,125.276192   C129.675720,127.780441 140.746811,126.206741 149.044968,116.391853   C156.985992,106.999374 156.451813,96.634232 150.882095,86.186157  z"/>
+<path fill="#90BF02" opacity="1.000000" stroke="none" d=" M150.670471,86.124481   C156.451813,96.634232 156.985992,106.999374 149.044968,116.391853   C140.746811,126.206741 129.675720,127.780441 117.680908,125.276192   C116.064545,124.938728 114.508804,124.310890 112.540359,123.741951   C112.155739,123.666389 112.150314,123.325104 112.115219,123.158279   C113.195747,122.351624 114.517334,121.918007 115.395844,121.040718   C126.875618,109.576714 138.292679,98.049911 149.880432,86.239487   C150.035370,85.940079 150.458832,86.062805 150.670471,86.124481  z"/>
+</svg>

auth/assets/custom-icons/icons/prey_project.svg

@@ -0,0 +1 @@
+<svg enable-background="new 0 0 512 512" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="m256.024 29.736-80.851 46.679 53.892 31.112 26.887-15.556 27.017 15.548 53.881-31.119z" fill="#3c77b9"/><path d="m256.036 512 202.079-116.681-.006-124.454-53.912 31.115.019 62.224-148.204 85.569-148.221-85.586-.005-62.221-53.871-31.102v124.442z" fill="#3c77b9"/><path d="m215.607 301.986-53.91 31.117 94.318 54.433 94.288-54.443-53.879-31.118 188.657-108.927-.041-62.184 26.96-15.564-.021-77.759-229.045 132.233-26.929-15.554-26.949 15.554-229.056-132.222v77.789l26.98 15.574-.01 62.153z" fill="#1f2938"/></svg>

auth/assets/custom-icons/icons/runescape_wiki.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="35" height="35" viewBox="0 0 35 35">
+  <g fill="#438ab5" fill-rule="evenodd" transform="translate(4 1)">
+    <path d="M11.7311354 23.0557769L9.91249858 23.0557769 8.79846449 26.6069057 6.97030597 23 6.79891611 23 4.98027925 26.6347942 3.85672349 23.0557769 2 23.0557769 4.54228294 29.9814077 4.75175943 30 6.86556772 25.9189907 9.00794098 30 9.22693914 29.9814077 11.7311354 23.0557769zM14.3322795 29.8698539L14.3322795 23.0557769 12.7135975 23.0557769 12.7135975 29.8698539 14.3322795 29.8698539zM22.2084227 29.8698539L19.1900568 26.3001328 22.0560762 23.0557769 20.1422227 23.0557769 17.6951564 26.0212483 17.6951564 23.0557769 16.0764744 23.0557769 16.0764744 29.8698539 17.6951564 29.8698539 17.6951564 26.6812749 20.2564826 29.8698539 22.2084227 29.8698539zM25 29.8698539L25 23.0557769 23.381318 23.0557769 23.381318 29.8698539 25 29.8698539zM24.4742178 8.98009586L24.4742178 5.59616787C24.4732494 5.5136357 24.4163953 5.44228159 24.3362569 5.42252065 23.0272354 5.11977548 21.7162784 4.97854841 20.4033857 4.99883944 18.3648587 5.0303453 15.6405277 6.73541461 15.8150159 9.26543298 15.9313414 10.9521119 16.9379659 12.3146739 18.8348893 13.3531189 21.1050121 14.6587079 22.1112168 16.0505228 21.8535034 17.5285637 21.4669332 19.7456249 19.4833026 20.2699349 18.2011186 20.9636596 19.8933668 21.0568854 21.1108284 20.9541788 21.8535034 20.6555398 23.5576643 19.970275 24.621281 18.4776117 24.8765595 17.2814785 25.5814 13.9788769 23.0921699 12.4640398 21.8535034 11.6272857 20.6148368 10.7905315 18.5555838 9.39712448 18.5555838 8.2423436 18.5555838 7.08756273 19.0354769 6.19945178 20.606059 5.98878728 22.2560942 5.76746561 23.8084838 6.80552306 24.0666162 8.65926511 24.1000214 8.89915966 24.2358886 9.00610324 24.4742178 8.98009586z"/>
+    <path d="M12.1896778,5.73473633 C12.2458703,5.76929923 12.2836806,5.79287044 12.3031088,5.80544997 C13.8305405,6.79444234 14.5459886,7.96859313 14.4494531,9.32790236 C14.3458984,10.7860487 13.4278718,12.1833682 11.6953731,13.5198609 C11.995423,13.6024263 13.0716006,15.2517434 14.923906,18.4678119 C15.9400176,19.5870375 17.2645126,20.0440386 18.8973912,19.8388151 C17.7166822,20.6938532 16.5941307,21.0918329 15.5297368,21.032754 C13.9331458,20.9441357 12.5153495,20.0153267 11.6953731,18.9752651 C10.8753968,17.9352035 9.17647457,14.3916396 8.02078511,13.3656207 C9.24887971,13.3176267 10.0712516,13.0717507 10.4879009,12.6279929 C11.0163711,12.0651387 11.4324817,11.1727564 11.3052905,9.86386602 C11.242381,9.21648063 10.8576813,8.46000935 10.2600254,7.66096138 C10.1677374,7.53757512 10.1984144,7.42387917 10.3520565,7.31987355 C10.8366434,7.01067102 11.3224095,6.50739801 11.8093549,5.81005452 L11.8102004,5.81066099 C11.8971472,5.68944809 12.0629706,5.65600737 12.1900999,5.73404867 Z"/>
+    <path d="M5.46922112,0 C5.93751334,0 6.45488645,0.251926659 6.49405028,0.821037745 C6.52015951,1.20044514 6.40971704,1.46961432 6.16272288,1.62854529 L6.36548563,4.50160863 L9.73880697,4.59010439 C9.80515586,4.59184498 9.86880672,4.61673544 9.91873596,4.66046503 L10.8936611,5.51433494 C11.0118247,5.61782632 11.0237189,5.79751318 10.9202275,5.91567678 C10.9171724,5.91916507 10.9140324,5.92257811 10.9108103,5.92591286 L10.3160188,6.541511 C10.2118589,6.64931459 10.0419078,6.65776756 9.92756462,6.56083181 L9.4018415,6.11514401 L9.4018415,6.11514401 L7.33749093,6.11514401 C6.98986751,6.27375711 6.78712075,6.48688034 6.72925065,6.75451369 C6.67138054,7.02214704 6.66841118,9.38843602 6.72034254,13.8533806 C6.72034254,15.5011837 6.88214839,17.3116009 7.20576008,19.2846324 L5.58460752,21.9888272 L3.70958016,19.2846324 C4.08537518,17.1566151 4.27327269,15.282922 4.27327269,13.6635531 L3.43377358,12.9035744 L4.28218079,12.0252455 C4.31100967,8.71955904 4.31100967,6.96264844 4.28218079,6.75451369 C4.23893746,6.44231156 4.03865152,6.30830705 3.71848826,6.11514401 L1.69132923,6.11514401 L1.15474102,6.5615377 C1.03891569,6.65789407 0.868043682,6.64720638 0.765127903,6.53716821 L0.191996049,5.92437216 C0.0855950374,5.81060756 0.0905023165,5.63241981 0.203003442,5.52468375 L1.09677655,4.66876709 C1.14782548,4.61988037 1.2152487,4.59175365 1.28590527,4.58986886 L4.5946007,4.50160863 L4.5946007,4.50160863 L4.76223107,1.62854529 C4.55067524,1.43081789 4.44489732,1.16164871 4.44489732,0.821037745 C4.44489732,0.310121294 5.0009289,0 5.46922112,0 Z"/>
+  </g>
+</svg>

auth/assets/custom-icons/icons/workflowy.svg

@@ -0,0 +1,8 @@
+<svg width="34" height="34" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.625 2.77295H30.3256C31.8396 2.77295 33.0669 3.99814 33.0669 5.5095C33.0669 7.02087 31.8396 8.24604 30.3256 8.24604H6.625V2.77295Z" fill="#B2CADB"/>
+<path d="M12.4502 14.5747H30.3256C31.8396 14.5747 33.0669 15.7999 33.0669 17.3113C33.0669 18.8226 31.8396 20.0478 30.3256 20.0478H12.4502V14.5747Z" fill="#B2CADB"/>
+<path d="M6.625 26.376H30.3256C31.8396 26.376 33.0669 27.6012 33.0669 29.1125C33.0669 30.6239 31.8396 31.8491 30.3256 31.8491H6.625V26.376Z" fill="#B2CADB"/>
+<path d="M4.74009 10.2417C7.35797 10.2417 9.48018 8.12317 9.48018 5.50979C9.48018 2.8964 7.35797 0.777832 4.74009 0.777832C2.12221 0.777832 0 2.8964 0 5.50979C0 8.12317 2.12221 10.2417 4.74009 10.2417Z" fill="#47525B"/>
+<path d="M13.4208 22.043C16.0387 22.043 18.1609 19.9244 18.1609 17.3111C18.1609 14.6977 16.0387 12.5791 13.4208 12.5791C10.8029 12.5791 8.68066 14.6977 8.68066 17.3111C8.68066 19.9244 10.8029 22.043 13.4208 22.043Z" fill="#47525B"/>
+<path d="M4.74009 33.8448C7.35797 33.8448 9.48018 31.7262 9.48018 29.1128C9.48018 26.4994 7.35797 24.3809 4.74009 24.3809C2.12221 24.3809 0 26.4994 0 29.1128C0 31.7262 2.12221 33.8448 4.74009 33.8448Z" fill="#47525B"/>
+</svg>

auth/lib/core/network.dart

@@ -8,6 +8,7 @@ import 'package:ente_auth/utils/package_info_util.dart';
 import 'package:ente_auth/utils/platform_util.dart';
 import 'package:fk_user_agent/fk_user_agent.dart';
 import 'package:flutter/foundation.dart';
+import 'package:native_dio_adapter/native_dio_adapter.dart';
 import 'package:uuid/uuid.dart';
 
 int kConnectTimeout = 15000;
@@ -50,6 +51,10 @@ class Network {
         },
       ),
     );
+
+    _dio.httpClientAdapter = NativeAdapter();
+    _enteDio.httpClientAdapter = NativeAdapter();
+
     _setupInterceptors(endpoint);
 
     Bus.instance.on<EndpointUpdatedEvent>().listen((event) {

auth/lib/events/opened_settings_event.dart

@@ -1,3 +0,0 @@
-import 'package:ente_auth/events/event.dart';
-
-class OpenedSettingsEvent extends Event {}

auth/lib/json/converter.dart

@@ -1,17 +0,0 @@
-import 'dart:typed_data';
-
-import "package:json_annotation/json_annotation.dart";
-
-class Uint8ListConverter implements JsonConverter<Uint8List, List<int>> {
-  const Uint8ListConverter();
-
-  @override
-  Uint8List fromJson(List<int>? json) {
-    return json == null ? Uint8List(0) : Uint8List.fromList(json);
-  }
-
-  @override
-  List<int> toJson(Uint8List object) {
-    return object.toList();
-  }
-}

auth/lib/l10n/arb/app_ar.arb

@@ -482,7 +482,6 @@
   "importFailureDescNew": "تعذر إعراب الملف المنتقى.",
   "duplicateCodes": "رموز مكررة",
   "noDuplicates": "✨ لا تكرارات",
-  "youveNoDuplicateCodesThatCanBeCleared": "ليس لديك رموز مكررة يمكن مسحها",
   "deselectAll": "ألغِ تحديد الكل",
   "selectAll": "حدد الكل",
   "deleteDuplicates": "احذف التكرار"

auth/lib/l10n/arb/app_bg.arb

@@ -499,10 +499,11 @@
   "appLockOfflineModeWarning": "Избрахте да продължите без резервни копия. Ако забравите паролата на приложението си, ще бъдете заключени от достъп до вашите данни.",
   "duplicateCodes": "Повтарящи се кодове",
   "noDuplicates": "✨ Няма дубликати",
-  "youveNoDuplicateCodesThatCanBeCleared": "Нямате повтарящи се кодове, които могат да бъдат изчистени",
   "deduplicateCodes": "Премахване на повтарящи се кодове",
   "deselectAll": "Демаркиране на всички",
   "selectAll": "Избиране на всички",
   "deleteDuplicates": "Изтриване на дубликатите",
-  "plainHTML": "Обикновен HTML"
+  "plainHTML": "Обикновен HTML",
+  "tellUsWhatYouThink": "Кажете ни какво мислите",
+  "freeStorageOfferDescription": "Използвайте промокод „AUTH“, за да получите 10% отстъпка през първата година"
 }

auth/lib/l10n/arb/app_ca.arb

@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Has triat procedir sense còpies de seguretat. Si oblides el bloqueig de l'aplicació, no podràs accedir a les teves dades.",
   "duplicateCodes": "Codis duplicats",
   "noDuplicates": "✨ Sense duplicats",
-  "youveNoDuplicateCodesThatCanBeCleared": "No teniu codis duplicats que es puguin esborrar",
   "deduplicateCodes": "Desduplica codis",
   "deselectAll": "Desselecciona-ho tot",
   "selectAll": "Seleccionar-ho tot",

auth/lib/l10n/arb/app_cs.arb

@@ -495,7 +495,6 @@
   "appLockOfflineModeWarning": "Zvolili jste si pokračování bez zálohování. Pokud zapomenete heslo do aplikace, přístup k datům bude uzamčen.",
   "duplicateCodes": "Duplikovat kódy",
   "noDuplicates": "✨ Žádné duplikáty",
-  "youveNoDuplicateCodesThatCanBeCleared": "Nemáte žádné duplicitní kódy k odstranění",
   "deduplicateCodes": "Deduplikovat kódy",
   "deselectAll": "Zrušit výběr všech položek",
   "selectAll": "Vybrat vše",

auth/lib/l10n/arb/app_de.arb

@@ -147,6 +147,7 @@
   "leaveFamily": "Familie verlassen",
   "leaveFamilyMessage": "Sind Sie sicher, dass Sie den Familien-Plan verlassen wollen?",
   "inFamilyPlanMessage": "Sie haben einen Familien-Plan!",
+  "hintForDesktop": "Klicken Sie mit der rechten Maustaste auf einen Code zum Bearbeiten oder Entfernen.",
   "scan": "Scannen",
   "scanACode": "Scan einen Code",
   "verify": "Überprüfen Sie",
@@ -156,6 +157,7 @@
   "twoFactorAuthTitle": "Zwei-Faktor-Authentifizierung",
   "passkeyAuthTitle": "Passkey Authentifizierung",
   "verifyPasskey": "Passkey verifizieren",
+  "loginWithTOTP": "Mit TOTP anmelden",
   "recoverAccount": "Konto wiederherstellen",
   "enterRecoveryKeyHint": "Geben Sie Ihren Wiederherstellungsschlüssel ein",
   "recover": "Wiederherstellen",
@@ -258,6 +260,8 @@
   "yesLogout": "Ja ausloggen",
   "exit": "Schließen",
   "theme": "Theme",
+  "lightTheme": "Hell",
+  "darkTheme": "Dunkel",
   "systemTheme": "System",
   "verifyingRecoveryKey": "Verifiziere Wiederherstellungsschlüssel...",
   "recoveryKeyVerified": "Wiederherstellungsschlüssel verifiziert",
@@ -330,6 +334,9 @@
     }
   },
   "manualSort": "Benutzerdefiniert",
+  "editOrder": "Reihenfolge bearbeiten",
+  "mostFrequentlyUsed": "Häufig verwendet",
+  "mostRecentlyUsed": "Zuletzt verwendet",
   "activeSessions": "Aktive Sitzungen",
   "somethingWentWrongPleaseTryAgain": "Ein Fehler ist aufgetreten, bitte versuche es erneut",
   "thisWillLogYouOutOfThisDevice": "Dadurch wirst du von diesem Gerät abgemeldet!",
@@ -449,6 +456,7 @@
   "customEndpoint": "Mit {endpoint} verbunden",
   "pinText": "Anpinnen",
   "unpinText": "Lösen",
+  "pinned": "Angeheftet",
   "tags": "Tags",
   "createNewTag": "Neuen Tag erstellen",
   "tag": "Tag",
@@ -484,8 +492,15 @@
   "importFailureDescNew": "Die ausgewählte Datei konnte nicht verarbeitet werden.",
   "appLockNotEnabled": "App-Sperre nicht aktiviert",
   "appLockNotEnabledDescription": "Bitte aktivieren Sie die App-Sperre über Security > App-Sperre",
+  "authToViewPasskey": "Bitte authentifizieren, um deinen Passkey zu sehen",
   "duplicateCodes": "Doppelte Codes",
   "noDuplicates": "✨ Keine Duplikate",
   "deselectAll": "Alle abwählen",
-  "selectAll": "Alles auswählen"
+  "selectAll": "Alles auswählen",
+  "deleteDuplicates": "Duplikate löschen",
+  "plainHTML": "Reines HTML",
+  "tellUsWhatYouThink": "Sagen Sie uns, was Sie denken",
+  "dropReview": "Eine Bewertung im App/Play Store ablegen",
+  "giveUsAStarOnGithub": "Gib uns einen Stern auf Github",
+  "loginWithAuthAccount": "Mit Ihrem Auth Account anmelden"
 }

auth/lib/l10n/arb/app_en.arb

@@ -499,7 +499,7 @@
   "appLockOfflineModeWarning": "You have chosen to proceed without backups. If you forget your applock, you will be locked out from accessing your data.",
   "duplicateCodes": "Duplicate codes",
   "noDuplicates": "✨ No duplicates",
-  "youveNoDuplicateCodesThatCanBeCleared": "You've no duplicate codes that can be cleared",
+  "youveNoDuplicateCodesThatCanBeCleared": "You don't have any duplicate codes that can be cleared",
   "deduplicateCodes": "Deduplicate codes",
   "deselectAll": "Deselect all",
   "selectAll": "Select all",

auth/lib/l10n/arb/app_es.arb

@@ -510,6 +510,7 @@
   "supportEnte": "Apoya a <bold-green>ente</bold-green>",
   "giveUsAStarOnGithub": "Danos una estrella en GitHub",
   "free5GB": "5 GB gratis en <bold-green>ente</bold-green> Fotos",
+  "loginWithAuthAccount": "Inicia sesión con tu cuenta de Auth",
   "freeStorageOffer": "10% de descuento en <bold-green>ente</bold-green> fotos",
   "freeStorageOfferDescription": "Usa el cupón \"AUTH\" para obtener un 10% de descuento en el primer año"
 }

auth/lib/l10n/arb/app_fr.arb

@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Vous avez choisi de fonctionner sans sauvegardes. Si vous oubliez votre outil Applock, vous serez bloqué dans l'accès à vos données.",
   "duplicateCodes": "Codes dupliqués",
   "noDuplicates": "✨ Pas de doublons",
-  "youveNoDuplicateCodesThatCanBeCleared": "Vous n'avez aucun code en doublon pouvant être supprimé",
   "deduplicateCodes": "Codes dédupliqués",
   "deselectAll": "Tout désélectionner",
   "selectAll": "Tout sélectionner",

auth/lib/l10n/arb/app_hi.arb

@@ -6,12 +6,15 @@
   "@counterAppBarTitle": {
     "description": "Text shown in the AppBar of the Counter Page"
   },
+  "onBoardingBody": "अपने 2FA कोड का सुरक्षित रूप से बैकअप लें",
   "onBoardingGetStarted": "प्रारंभ करें",
   "setupFirstAccount": "अपना पहला अकाउंट सेटअप करें",
   "importScanQrCode": "एक QR कोड स्कैन करें",
   "qrCode": "QR कोड",
   "importEnterSetupKey": "",
   "importAccountPageTitle": "अकाउंट विवरण डालें",
+  "secretCanNotBeEmpty": "सीक्रेट खाली नहीं हो सकता है",
+  "bothIssuerAndAccountCanNotBeEmpty": "दोनों इश्यूअर और अकाउंट ख़ाली नहीं हो सकते है",
   "incorrectDetails": "ग़लत विवरण",
   "pleaseVerifyDetails": "कृपया विवरण सत्यापित करें और पुनः प्रयास करें",
   "codeIssuerHint": "ज़ारीकर्ता",
@@ -32,18 +35,24 @@
   },
   "codeAccountHint": "अकाउंट (you@domain.com)",
   "codeTagHint": "टैग",
+  "accountKeyType": "की का प्रकार",
   "sessionExpired": "सत्र की अवधि समाप्त",
   "@sessionExpired": {
     "description": "Title of the dialog when the users current session is invalid/expired"
   },
   "pleaseLoginAgain": "कृपया फिर से लॉगिन करें",
   "loggingOut": "लॉग आउट हो रहा है...",
+  "timeBasedKeyType": "समय आधारित (TOTP)",
+  "counterBasedKeyType": "काउंटर आधारित (HOTP)",
   "saveAction": "सेव करें",
+  "nextTotpTitle": "अगला",
+  "deleteCodeTitle": "कोड डिलीट करें?",
   "deleteCodeMessage": "क्या आप वाकई इस कोड को हटाना चाहते हैं? इस क्रिया को वापस नहीं किया जा सकता",
   "trashCode": "?",
   "trashCodeMessage": "क्या आप वाकई {account} के लिए कोड नष्ट करना चाहते हैं?",
   "trash": "नष्ट करें",
   "viewLogsAction": "लॉग देखें",
+  "sendLogsDescription": "यह आपकी समस्या को सुलझाने में हमारी सहायता के लिए लॉग भेजेगा। हालाँकि हम यह सुनिश्चित करने के लिए सावधानी बरतते हैं कि संवेदनशील जानकारी लॉग न हो, हम आपको इन लॉग को साझा करने से पहले देखने के लिए प्रोत्साहित करते हैं।",
   "preparingLogsTitle": "लॉग तैयार किये जा रहे हैं...",
   "emailLogsTitle": "लॉग ईमेल करें",
   "emailLogsMessage": "कृपया {email} पर लॉग ईमेल करें",
@@ -57,6 +66,7 @@
   "copyEmailAction": "ईमेल कॉपी करें",
   "exportLogsAction": "लॉग एक्सपोर्ट करें",
   "reportABug": "बग रिपोर्ट करें",
+  "crashAndErrorReporting": "क्रैश एवं त्रुटि रिपोर्टिंग",
   "reportBug": "बग रिपोर्ट करें",
   "emailUsMessage": "कृपया हमें {email} पर ईमेल करें",
   "@emailUsMessage": {
@@ -69,14 +79,37 @@
   "contactSupport": "सपोर्ट टीम से संपर्क करें",
   "rateUsOnStore": "हमें {storeName} पर रेट करें",
   "blog": "ब्लॉग",
+  "merchandise": "मर्चेंडाइज़",
   "verifyPassword": "पासवर्ड सत्यापित करें",
   "pleaseWait": "कृपया प्रतीक्षा करें...",
+  "generatingEncryptionKeysTitle": "एन्क्रिप्शन कुंजियाँ उत्पन्न हो रही हैं...",
+  "recreatePassword": "पासवर्ड दोबारा बनाएं",
+  "recreatePasswordMessage": "वर्तमान डिवाइस आपके पासवर्ड को सत्यापित करने के लिए पर्याप्त शक्तिशाली नहीं है, इसलिए हमें इसे सभी डिवाइसों के साथ काम करने वाले तरीके से एक बार पुन: उत्पन्न करने की आवश्यकता है। \n\nकृपया अपनी पुनर्प्राप्ति कुंजी का उपयोग करके लॉगिन करें और अपना पासवर्ड पुनः बनाएं (यदि आप चाहें तो उसी का दोबारा उपयोग कर सकते हैं)।",
+  "useRecoveryKey": "रिकवरी कुंजी का उपयोग करें",
   "incorrectPasswordTitle": "ग़लत पासवर्ड",
   "welcomeBack": "आपका पुनः स्वागत है!",
+  "emailAlreadyRegistered": "ईमेल पहले से ही पंजीकृत है।",
+  "emailNotRegistered": "ईमेल पंजीकृत नहीं है।",
+  "madeWithLoveAtPrefix": " ❤️ से बनाया गया ",
+  "supportDevs": "हमें समर्थन देने के लिए <bold-green>ente</bold-green> की सदस्यता लें",
+  "supportDiscount": "पहले साल 10% छूट पाने के लिए कूपन कोड \"AUTH\" का उपयोग करें",
   "changeEmail": "ईमेल बदलें",
   "changePassword": "पासवर्ड बदलें",
   "data": "डेटा",
+  "importCodes": "कोड आयात करें",
+  "importTypePlainText": "साधारण टेक्स्ट",
+  "importTypeEnteEncrypted": "Ente द्वारा एनक्रिप्टेड टेक्स्ट",
+  "passwordForDecryptingExport": "डीक्रिप्ट करने के लिए पासवर्ड",
   "passwordEmptyError": "पासवर्ड रिक्त नहीं हो सकता है",
+  "importFromApp": "{appName} से कोड इंपोर्ट करें",
+  "importGoogleAuthGuide": "ट्रांसफर अकाउंट्स\" विकल्प का उपयोग करके अपने खातों को Google प्रमाणक से एक क्यूआर कोड में निर्यात करें। फिर किसी अन्य डिवाइस का उपयोग करके QR कोड को स्कैन करें।\n\nटिप: क्यूआर कोड की तस्वीर लेने के लिए आप अपने लैपटॉप के वेबकैम का उपयोग कर सकते हैं।",
+  "importSelectJsonFile": "JSON फाइल चुनें",
+  "importSelectAppExport": "{appName} की निर्यात फ़ाइल का चयन करें",
+  "importEnteEncGuide": "Ente से निर्यात की गई एन्क्रिप्टेड JSON फ़ाइल का चयन करें",
+  "importRaivoGuide": "Raivo की सेटिंग्स में \"एक्सपोर्ट ओटीपी टू जिप आर्काइव\" विकल्प का उपयोग करें।\n\nज़िप फ़ाइल निकालें और JSON फ़ाइल आयात करें।",
+  "importBitwardenGuide": "बिटवर्डन टूल्स के भीतर \"एक्सपोर्ट वॉल्ट\" विकल्प का उपयोग करें और अनएन्क्रिप्टेड JSON फ़ाइल आयात करें।",
+  "importAegisGuide": "Aegis की सेटिंग्स में \"एक्सपोर्ट द वॉल्ट\" विकल्प का उपयोग करें।\n\nयदि आपकी वॉल्ट एन्क्रिप्टेड है, तो आपको वॉल्ट को डिक्रिप्ट करने के लिए वॉल्ट पासवर्ड दर्ज करना होगा।",
+  "import2FasGuide": "2FAS में \"सेटिंग्स->बैकअप-एक्सपोर्ट\" विकल्प का उपयोग करें।\n\nयदि आपका बैकअप एन्क्रिप्टेड है, तो आपको बैकअप को डिक्रिप्ट करने के लिए पासवर्ड दर्ज करना होगा",
   "importLabel": "इंपोर्ट",
   "selectFile": "फ़ाइल का चयन करें",
   "emailVerificationToggle": "ईमेल सत्यापन",

auth/lib/l10n/arb/app_hu.arb

@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Úgy döntött, hogy biztonsági mentés nélkül folytatja. Ha elfelejti az alkalmazászárat, akkor nem férhet hozzá adataihoz.",
   "duplicateCodes": "Ismétlődő kódok",
   "noDuplicates": "✨Nincs ismétlődés",
-  "youveNoDuplicateCodesThatCanBeCleared": "Nincsenek ismétlődő kódjai, amelyeket törölni lehetne",
   "deduplicateCodes": "Ismétlődő kódok",
   "deselectAll": "Összes kijelölés megszüntetése",
   "selectAll": "Összes kijelölése",

auth/lib/l10n/arb/app_id.arb

@@ -497,7 +497,6 @@
   "appLockOfflineModeWarning": "Anda telah memilih untuk mengunci aplikasi tanpa cadangan apa pun. Jika Anda lupa kode Pengunci Apl Anda, Anda tidak akan dapat mengakses data-data Anda.",
   "duplicateCodes": "Kode duplikat",
   "noDuplicates": "✨ Tak ada duplikat",
-  "youveNoDuplicateCodesThatCanBeCleared": "Kamu tidak memiliki kode duplikat yang dapat dihapus",
   "deduplicateCodes": "Hapus kode duplikat",
   "deselectAll": "Batalkan semua pilihan",
   "selectAll": "Pilih semua",

auth/lib/l10n/arb/app_ko.arb

@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "백업 없이 진행하는 것을 선택하셨습니다. App 잠금 방법을 잊어버리신 경우, 데이터에 접근하실 수 없게 됩니다.",
   "duplicateCodes": "중복된 코드",
   "noDuplicates": "✨ 중복 없음",
-  "youveNoDuplicateCodesThatCanBeCleared": "지울 수 있는 중복 코드가 없습니다",
   "deduplicateCodes": "중복된 코드 제거",
   "deselectAll": "모두 선택 해제",
   "selectAll": "모두 선택",

auth/lib/l10n/arb/app_lt.arb

@@ -505,5 +505,10 @@
   "selectAll": "Pasirinkti viską",
   "deleteDuplicates": "Ištrinti dublikatus",
   "plainHTML": "Grynasis HTML",
+  "tellUsWhatYouThink": "Pasakykite mums, ką manote",
+  "giveUsAStarOnGithub": "Suteikite mums žvaigždutę platformoje „Github“",
+  "free5GB": "5 GB nemokami programai „<bold-green>ente</bold-green>“ nuotraukos",
+  "loginWithAuthAccount": "Prisijungti su jūsų „Auth“ paskyra",
+  "freeStorageOffer": "10 % nuolaida programai „<bold-green>ente</bold-green>“ nuotraukos",
   "freeStorageOfferDescription": "Naudokite kodą „AUTH“, kad gautumėte 10 % nuolaida pirmiesiems metams. "
 }

auth/lib/l10n/arb/app_ml.arb

@@ -1,4 +1,7 @@
 {
+  "account": "അക്കൗണ്ട്",
+  "unlock": "അൺലോക്ക്",
+  "qrCode": "QR കോഡ്",
   "blog": "ബ്ലോഗ്",
   "verifyPassword": "പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
   "recreatePassword": "പാസ്‌വേഡ് പുനഃസൃഷ്ടിക്കുക",

auth/lib/l10n/arb/app_nl.arb

@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Je hebt ervoor gekozen om verder te gaan zonder backups. Als je jouw applock vergeet, wordt je uitgesloten van toegang tot je gegevens.",
   "duplicateCodes": "Dubbele codes",
   "noDuplicates": "✨ Geen dubbele",
-  "youveNoDuplicateCodesThatCanBeCleared": "Je hebt geen dubbele codes die kunnen worden gewist",
   "deduplicateCodes": "Dubbele codes",
   "deselectAll": "Alles deselecteren",
   "selectAll": "Alles selecteren",

auth/lib/l10n/arb/app_pl.arb

@@ -499,7 +499,7 @@
   "appLockOfflineModeWarning": "Wybrano kontynuowanie bez kopii zapasowych. Jeśli zapomnisz blokady aplikacji, utracisz dostęp do swoich danych.",
   "duplicateCodes": "Zduplikowane kody",
   "noDuplicates": "✨ Brak duplikatów",
-  "youveNoDuplicateCodesThatCanBeCleared": "Nie masz duplikatów kodów, które mogą być wyczyszczone",
+  "youveNoDuplicateCodesThatCanBeCleared": "Nie masz żadnych duplikatów kodów do usunięcia",
   "deduplicateCodes": "Deduplikuj kody",
   "deselectAll": "Odznacz wszystko",
   "selectAll": "Zaznacz wszystko",

auth/lib/l10n/arb/app_pt.arb

@@ -499,7 +499,7 @@
   "appLockOfflineModeWarning": "Você prosseguiu sem cópias de segurança. Caso, se esqueça de seu aplicativo de bloqueio, você não poderá mais acessar seus dados.",
   "duplicateCodes": "Duplicar códigos",
   "noDuplicates": "✨ Sem duplicados",
-  "youveNoDuplicateCodesThatCanBeCleared": "Você não possui códigos duplicados para limpar",
+  "youveNoDuplicateCodesThatCanBeCleared": "Você não possui códigos duplicados que possam ser excluídos",
   "deduplicateCodes": "Desduplicar códigos",
   "deselectAll": "Deselecionar tudo",
   "selectAll": "Selecionar tudo",

auth/lib/l10n/arb/app_sl.arb

@@ -88,6 +88,8 @@
   "useRecoveryKey": "Uporabi ključ za obnovo",
   "incorrectPasswordTitle": "Nepravilno geslo",
   "welcomeBack": "Dobrodošli nazaj!",
+  "emailAlreadyRegistered": "E-poštni naslov je že registriran.",
+  "emailNotRegistered": "E-poštni naslov ni registriran.",
   "madeWithLoveAtPrefix": "ustvarjeno s ❤️pri ",
   "supportDevs": "Naročite se na <bold-green>ente</bold-green>, da nas podprete",
   "supportDiscount": "Uporabite kupon \"AUTH\" za 10% popusta za prvo leto",
@@ -156,6 +158,7 @@
   "twoFactorAuthTitle": "Dvojno preverjanja pristnosti",
   "passkeyAuthTitle": "Potrditev ključa za dostop (passkey)",
   "verifyPasskey": "Potrdite ključ za dostop (passkey)",
+  "loginWithTOTP": "Prijava z TOTP",
   "recoverAccount": "Obnovi račun",
   "enterRecoveryKeyHint": "Vnesite vaš ključ za obnovitev",
   "recover": "Obnovi",
@@ -257,6 +260,10 @@
   "areYouSureYouWantToLogout": "Ali ste prepričani, da se želite odjaviti?",
   "yesLogout": "Ja, odjavi se",
   "exit": "Izhod",
+  "theme": "Tema",
+  "lightTheme": "Svetla",
+  "darkTheme": "Temna",
+  "systemTheme": "Sistemska",
   "verifyingRecoveryKey": "Preverjanje ključa za obnovitev",
   "recoveryKeyVerified": "Ključ za obnovitev preverjen",
   "recoveryKeySuccessBody": "Odlično! Vaš ključ za obnovitev je veljaven. Hvala za preverjanje.\n\nNe pozabite shraniti varnostno kopijo obnovitvenega ključa.",
@@ -327,6 +334,8 @@
       }
     }
   },
+  "manualSort": "Po meri",
+  "editOrder": "Uredi vrstni red",
   "mostFrequentlyUsed": "Pogosto uporabljeni",
   "mostRecentlyUsed": "Nedavno uporabljeno",
   "activeSessions": "Aktivne seje",
@@ -448,6 +457,8 @@
   "customEndpoint": "Povezano na {endpoint}",
   "pinText": "Pripni",
   "unpinText": "Odpni",
+  "pinnedCodeMessage": "{code} je bila pripeta",
+  "unpinnedCodeMessage": "{code} je bila odpeta",
   "pinned": "Pripeto",
   "tags": "Oznake",
   "createNewTag": "Ustvari novo oznako",
@@ -485,5 +496,21 @@
   "appLockNotEnabled": "Zaklepanje aplikacije ni omogočeno",
   "appLockNotEnabledDescription": "Prosimo, omogočite zaklepanje aplikacije v Nastavitve > Zaklepanje Aplikacije (Security > App Lock)",
   "authToViewPasskey": "Da vidite passkey, se overite",
-  "appLockOfflineModeWarning": "Odločili ste se, da boste nadaljevali brez varnostnih kopij. Če boste pozabili geslo za odklepanje aplikacije, bo dostop do vaših podatkov onemogočen."
+  "appLockOfflineModeWarning": "Odločili ste se, da boste nadaljevali brez varnostnih kopij. Če boste pozabili geslo za odklepanje aplikacije, bo dostop do vaših podatkov onemogočen.",
+  "duplicateCodes": "Podvojene kode",
+  "noDuplicates": "✨ Ni duplikatov",
+  "youveNoDuplicateCodesThatCanBeCleared": "Nimate nobenih podvojenih kod, ki bi jih bilo mogoče izbrisati",
+  "deduplicateCodes": "Dedupliciraj kode",
+  "deselectAll": "Prekliči celoten izbor",
+  "selectAll": "Izberi vse",
+  "deleteDuplicates": "Izbriši dvojnike",
+  "plainHTML": "Navadni HTML",
+  "tellUsWhatYouThink": "Povejte nam kaj mislite",
+  "dropReview": "Napišite oceno v trgovini App/Play Store",
+  "supportEnte": "Podpiraj <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "Dajte nam zvezdico na Githubu",
+  "free5GB": "5 GB zastonj na <bold-green>ente</bold-green> fotografije",
+  "loginWithAuthAccount": "Prijavite se s svojim Auth računom",
+  "freeStorageOffer": "10 % popust na <bold-green>ente</bold-green> fotografije",
+  "freeStorageOfferDescription": "Uporabite kupon \"AUTH\" za 10% popusta za prvo leto"
 }

auth/lib/l10n/arb/app_sv.arb

@@ -267,7 +267,9 @@
   "verifyingRecoveryKey": "Verifierar återställningsnyckel...",
   "recoveryKeyVerified": "Återställningsnyckel verifierad",
   "recoveryKeySuccessBody": "Grymt! Din återställningsnyckel är giltig. Tack för att du verifierade.\n\nKom ihåg att hålla din återställningsnyckel säker med backups.",
+  "invalidRecoveryKey": "Återställningsnyckeln du angav är inte giltig. Kontrollera att den innehåller 24 ord och kontrollera stavningen av varje ord.\n\nOm du har angett en äldre återställningskod, se till att den är 64 tecken lång, och kontrollera var och en av bokstäverna.",
   "recreatePasswordTitle": "Återskapa lösenord",
+  "recreatePasswordBody": "Denna enhet är inte tillräckligt kraftfull för att verifiera ditt lösenord, men vi kan återskapa det på ett sätt som fungerar med alla enheter.\n\nLogga in med din återställningsnyckel och återskapa ditt lösenord (du kan använda samma igen om du vill).",
   "invalidKey": "Ogiltig nyckel",
   "tryAgain": "Försök igen",
   "viewRecoveryKey": "Visa återställningsnyckel",
@@ -279,6 +281,10 @@
   "copyEmailAddress": "Kopiera e-postadress",
   "exportLogs": "Exportera loggar",
   "enterYourRecoveryKey": "Ange din återställningsnyckel",
+  "tempErrorContactSupportIfPersists": "Det ser ut som om något gick fel. Försök igen efter en stund. Om felet kvarstår, vänligen kontakta vår support.",
+  "networkHostLookUpErr": "Det gick inte att ansluta till Ente, kontrollera dina nätverksinställningar och kontakta supporten om felet kvarstår.",
+  "networkConnectionRefusedErr": "Det gick inte att ansluta till Ente, försök igen om en stund. Om felet kvarstår, vänligen kontakta support.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Det ser ut som om något gick fel. Försök igen efter en stund. Om felet kvarstår, vänligen kontakta vår support.",
   "about": "Om",
   "weAreOpenSource": "Vi är öppen källkod!",
   "privacy": "Sekretess",
@@ -292,6 +298,7 @@
   "checking": "Kontrollerar ...",
   "youAreOnTheLatestVersion": "Du är på den senaste versionen",
   "warning": "Varning",
+  "exportWarningDesc": "Den exporterade filen innehåller känslig information. Förvara den på ett säkert sätt.",
   "iUnderStand": "Jag förstår",
   "@iUnderStand": {
     "description": "Text for the button to confirm the user understands the warning"
@@ -309,28 +316,46 @@
     }
   },
   "sorry": "Tyvärr",
+  "importFailureDesc": "Det gick inte att tolka den valda filen.\nSkriv till support@ente.io om du behöver hjälp!",
   "pendingSyncs": "Varning",
+  "pendingSyncsWarningBody": "En del av dina koder har inte säkerhetskopierats.\n\nSe till att du har en säkerhetskopia för dessa koder innan du loggar ut.",
   "checkInboxAndSpamFolder": "Vänligen kontrollera din inkorg (och skräppost) för att slutföra verifieringen",
   "tapToEnterCode": "Tryck för att ange kod",
   "resendEmail": "Skicka e-post igen",
+  "weHaveSendEmailTo": "Vi har skickat ett mail till <green>{email}</green>",
+  "@weHaveSendEmailTo": {
+    "description": "Text to indicate that we have sent a mail to the user",
+    "placeholders": {
+      "email": {
+        "description": "The email address of the user",
+        "type": "String",
+        "example": "example@ente.io"
+      }
+    }
+  },
   "manualSort": "Anpassad",
   "editOrder": "Redigera ordning",
   "mostFrequentlyUsed": "Ofta använd",
   "mostRecentlyUsed": "Senast använd",
   "activeSessions": "Aktiva sessioner",
+  "somethingWentWrongPleaseTryAgain": "Något gick fel, vänligen försök igen",
   "thisWillLogYouOutOfThisDevice": "Detta kommer att logga ut dig från den här enheten!",
+  "thisWillLogYouOutOfTheFollowingDevice": "Detta kommer att logga ut dig från följande enhet:",
   "terminateSession": "Avsluta session?",
   "terminate": "Avsluta",
   "thisDevice": "Den här enheten",
+  "toResetVerifyEmail": "För att återställa ditt lösenord måste du först bekräfta din e-postadress.",
   "thisEmailIsAlreadyInUse": "Denna e-postadress används redan",
   "verificationFailedPleaseTryAgain": "Verifiering misslyckades, vänligen försök igen",
   "yourVerificationCodeHasExpired": "Din verifieringskod har upphört att gälla",
   "incorrectCode": "Felaktig kod",
   "sorryTheCodeYouveEnteredIsIncorrect": "Tyvärr, den kod som du har angett är felaktig",
+  "emailChangedTo": "E-post ändrad till {newEmail}",
   "authenticationFailedPleaseTryAgain": "Autentisering misslyckades, vänligen försök igen",
   "authenticationSuccessful": "Autentisering lyckades!",
   "twofactorAuthenticationSuccessfullyReset": "Tvåfaktorsautentisering återställd",
   "incorrectRecoveryKey": "Felaktig återställningsnyckel",
+  "theRecoveryKeyYouEnteredIsIncorrect": "Återställningsnyckeln du angav är felaktig",
   "enterPassword": "Ange lösenord",
   "selectExportFormat": "Välj exportformat",
   "encrypted": "Krypterad",
@@ -343,6 +368,7 @@
   "showLargeIcons": "Visa stora ikoner",
   "compactMode": "Kompakt läge",
   "shouldHideCode": "Dölj koder",
+  "doubleTapToViewHiddenCode": "Du kan dubbeltrycka på en post för att visa koden",
   "focusOnSearchBar": "Fokusera på sök vid appstart",
   "minimizeAppOnCopy": "Minimera appen vid kopiering",
   "editCodeAuthMessage": "Autentisera för att redigera kod",
@@ -451,7 +477,6 @@
   "appLockOfflineModeWarning": "Du har valt att fortsätta utan säkerhetskopior. Om du glömmer ditt applås, kommer du att bli utelåst från att komma åt dina data.",
   "duplicateCodes": "Dubblettkoder",
   "noDuplicates": "✨ Inga dubbletter",
-  "youveNoDuplicateCodesThatCanBeCleared": "Du har inga dubblettkoder som kan rensas bort",
   "deduplicateCodes": "Deduplicera koder",
   "deselectAll": "Avmarkera alla",
   "selectAll": "Markera alla",

auth/lib/l10n/arb/app_tr.arb

@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Yedekleme olmadan devam etmeyi seçtiniz. Eğer uygulama parolanızı unutursanız, verilerinize erişiminiz engellenir.",
   "duplicateCodes": "Yinelenen kodlar",
   "noDuplicates": "✨ Yinelenen yok",
-  "youveNoDuplicateCodesThatCanBeCleared": "Temizlenebilecek yinelenen kodunuz yok",
   "deduplicateCodes": "Kodları tekilleştir",
   "deselectAll": "Tümünün seçimini kaldır",
   "selectAll": "Tümünü seç",

auth/lib/l10n/arb/app_uk.arb

@@ -497,7 +497,6 @@
   "appLockOfflineModeWarning": "Ви обрали продовжити без резервних копій. Якщо ви забудете свій пароль, доступ до ваших даних буде заблоковано.",
   "duplicateCodes": "Дублікати кодів",
   "noDuplicates": "✨ Немає дублікатів",
-  "youveNoDuplicateCodesThatCanBeCleared": "У вас немає дублікатів кодів, які можна очистити",
   "deduplicateCodes": "Дедуплікувати коди",
   "deselectAll": "Зняти виділення",
   "selectAll": "Вибрати все",

auth/lib/l10n/arb/app_vi.arb

@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Bạn đã chọn tiếp tục mà không có bản sao lưu. Nếu bạn quên khóa ứng dụng, bạn sẽ bị khóa khỏi việc truy cập dữ liệu của mình.",
   "duplicateCodes": "Mã trùng lặp",
   "noDuplicates": "✨ Không có trùng lặp",
-  "youveNoDuplicateCodesThatCanBeCleared": "Bạn không có mã trùng lặp nào có thể được xóa",
   "deduplicateCodes": "Loại bỏ mã trùng lặp",
   "deselectAll": "Bỏ chọn tất cả",
   "selectAll": "Chọn tất cả",

auth/lib/l10n/arb/app_zh.arb

@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "您已选择继续而不备份。如果您忘记了应用锁，您将无法访问数据。",
   "duplicateCodes": "重复代码",
   "noDuplicates": "✨ 没有重复",
-  "youveNoDuplicateCodesThatCanBeCleared": "您没有可清除的重复代码",
   "deduplicateCodes": "删除重复代码",
   "deselectAll": "取消全选",
   "selectAll": "全选",

auth/lib/models/code.dart

@@ -112,8 +112,9 @@ class Code {
     String issuer,
     String secret,
     CodeDisplay? display,
-    int digits,
-  ) {
+    int digits, {
+    Algorithm algorithm = Algorithm.sha1,
+  }) {
     final String encodedIssuer = Uri.encodeQueryComponent(issuer);
     return Code(
       account,
@@ -121,10 +122,10 @@ class Code {
       digits,
       defaultPeriod,
       secret,
-      Algorithm.sha1,
+      algorithm,
       type,
       0,
-      "otpauth://${type.name}/$issuer:$account?algorithm=SHA1&digits=$digits&issuer=$encodedIssuer&period=30&secret=$secret",
+      "otpauth://${type.name}/$issuer:$account?algorithm=${algorithm.name.toUpperCase()}&digits=$digits&issuer=$encodedIssuer&period=30&secret=$secret",
       display: display ?? CodeDisplay(),
     );
   }

auth/lib/models/magic_metadata.dart

@@ -1,73 +0,0 @@
-import 'dart:convert';
-
-const visibilityVisible = 0;
-const visibilityArchive = 1;
-
-const magicKeyVisibility = 'visibility';
-
-const pubMagicKeyEditedTime = 'editedTime';
-const pubMagicKeyEditedName = 'editedName';
-
-class MagicMetadata {
-  // 0 -> visible
-  // 1 -> archived
-  // 2 -> hidden etc?
-  int visibility;
-
-  MagicMetadata({required this.visibility});
-
-  factory MagicMetadata.fromEncodedJson(String encodedJson) =>
-      MagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory MagicMetadata.fromJson(dynamic json) => MagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return MagicMetadata(
-      visibility: map[magicKeyVisibility] ?? visibilityVisible,
-    );
-  }
-}
-
-class PubMagicMetadata {
-  int? editedTime;
-  String? editedName;
-
-  PubMagicMetadata({this.editedTime, this.editedName});
-
-  factory PubMagicMetadata.fromEncodedJson(String encodedJson) =>
-      PubMagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory PubMagicMetadata.fromJson(dynamic json) =>
-      PubMagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return PubMagicMetadata(
-      editedTime: map[pubMagicKeyEditedTime],
-      editedName: map[pubMagicKeyEditedName],
-    );
-  }
-}
-
-class CollectionMagicMetadata {
-  // 0 -> visible
-  // 1 -> archived
-  // 2 -> hidden etc?
-  int visibility;
-
-  CollectionMagicMetadata({required this.visibility});
-
-  factory CollectionMagicMetadata.fromEncodedJson(String encodedJson) =>
-      CollectionMagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory CollectionMagicMetadata.fromJson(dynamic json) =>
-      CollectionMagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return CollectionMagicMetadata(
-      visibility: map[magicKeyVisibility] ?? visibilityVisible,
-    );
-  }
-}

auth/lib/models/public_key.dart

@@ -1,6 +0,0 @@
-class PublicKey {
-  final String email;
-  final String publicKey;
-
-  PublicKey(this.email, this.publicKey);
-}

auth/lib/onboarding/view/setup_enter_secret_key_page.dart

@@ -13,6 +13,7 @@ import 'package:ente_auth/onboarding/view/common/field_label.dart';
 import 'package:ente_auth/onboarding/view/common/tag_chip.dart';
 import 'package:ente_auth/store/code_display_store.dart';
 import 'package:ente_auth/theme/ente_theme.dart';
+import 'package:ente_auth/ui/algorithm_selector_widget.dart';
 import 'package:ente_auth/ui/components/buttons/button_widget.dart';
 import 'package:ente_auth/ui/components/custom_icon_widget.dart';
 import 'package:ente_auth/ui/components/models/button_result.dart';
@@ -38,10 +39,12 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
   final Logger _logger = Logger('_SetupEnterSecretKeyPageState');
   final int _notesLimit = 500;
   final int _otherTextLimit = 200;
+  final int defaultDigits = 6;
   late TextEditingController _issuerController;
   late TextEditingController _accountController;
   late TextEditingController _secretController;
   late TextEditingController _notesController;
+  late TextEditingController _digitsController;
   late bool _secretKeyObscured;
   late List<String> selectedTags = [...?widget.code?.display.tags];
   List<String> allTags = [];
@@ -49,6 +52,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
   bool isCustomIcon = false;
   String _customIconID = "";
   late IconType _iconSrc;
+  late Algorithm _algorithm;
 
   @override
   void initState() {
@@ -65,6 +69,12 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
     _notesController = TextEditingController(
       text: widget.code?.display.note,
     );
+    _digitsController = TextEditingController(
+      text: widget.code != null
+          ? widget.code!.digits.toString()
+          : defaultDigits.toString(),
+    );
+
     _secretKeyObscured = widget.code != null;
     _loadTags();
     _streamSubscription = Bus.instance.on<CodesUpdatedEvent>().listen((event) {
@@ -101,6 +111,8 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
         ? IconType.simpleIcon
         : IconType.customIcon;
 
+    _algorithm = widget.code == null ? Algorithm.sha1 : widget.code!.algorithm;
+
     super.initState();
   }
 
@@ -121,6 +133,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
     _issuerController.dispose();
     _accountController.dispose();
     _notesController.dispose();
+    _digitsController.dispose();
     super.dispose();
   }
 
@@ -268,6 +281,79 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                     ],
                   ),
                   const SizedBox(height: 12),
+                  widget.code == null
+                      ? Theme(
+                          data: Theme.of(context).copyWith(
+                            splashColor: Colors.transparent,
+                            highlightColor: Colors.transparent,
+                            hoverColor: Colors.transparent,
+                          ),
+                          child: ExpansionTile(
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(8.0),
+                            ),
+                            collapsedShape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(8.0),
+                            ),
+                            collapsedBackgroundColor: Colors.transparent,
+                            tilePadding: EdgeInsets.zero,
+                            title: Text(
+                              "Advanced",
+                              style: getEnteTextTheme(context).small,
+                            ),
+                            children: <Widget>[
+                              Row(
+                                children: [
+                                  const FieldLabel("Digits"),
+                                  Expanded(
+                                    child: TextFormField(
+                                      keyboardType: TextInputType.number,
+                                      // The validator receives the text that the user has entered.
+                                      validator: (value) {
+                                        if (value == null || value.isEmpty) {
+                                          return "Please enter a number";
+                                        }
+                                        final intValue = int.tryParse(value);
+                                        if (intValue == null) {
+                                          return "Only integers are allowed";
+                                        }
+                                        if (intValue < 1 || intValue > 10) {
+                                          return "OTP digits must be between 1 and 10";
+                                        }
+                                        return null;
+                                      },
+                                      maxLines: 1,
+                                      decoration: const InputDecoration(
+                                        contentPadding: EdgeInsets.symmetric(
+                                          vertical: 12.0,
+                                        ),
+                                      ),
+                                      style: getEnteTextTheme(context).small,
+                                      controller: _digitsController,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                              const SizedBox(height: 22),
+                              Row(
+                                children: [
+                                  const FieldLabel("Algorithm"),
+                                  AlgorithmSelectorWidget(
+                                    currentAlgorithm: _algorithm,
+                                    onSelected: (newAlgorithm) async {
+                                      setState(() {
+                                        _algorithm = newAlgorithm;
+                                      });
+                                    },
+                                  ),
+                                ],
+                              ),
+                              const SizedBox(height: 12),
+                            ],
+                          ),
+                        )
+                      : const SizedBox.shrink(),
+                  const SizedBox(height: 12),
                   Wrap(
                     spacing: 12,
                     alignment: WrapAlignment.start,
@@ -322,12 +408,29 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                         padding: const EdgeInsets.symmetric(vertical: 8),
                       ),
                       onPressed: () async {
+                        final digits =
+                            int.tryParse(_digitsController.text.trim());
+                        if (digits != null && (digits < 1 || digits > 10)) {
+                          String message = "Digits must be between 1 and 10";
+                          _showIncorrectDetailsDialog(
+                            context,
+                            message: message,
+                          );
+                          return;
+                        }
+
                         if ((_accountController.text.trim().isEmpty &&
                                 _issuerController.text.trim().isEmpty) ||
-                            _secretController.text.trim().isEmpty) {
+                            _secretController.text.trim().isEmpty ||
+                            _digitsController.text.trim().isEmpty ||
+                            digits == null) {
                           String message;
                           if (_secretController.text.trim().isEmpty) {
                             message = context.l10n.secretCanNotBeEmpty;
+                          } else if (_digitsController.text.isEmpty) {
+                            message = "Digits cannot be empty";
+                          } else if (digits == null) {
+                            message = "Digits is not a integer";
                           } else {
                             message =
                                 context.l10n.bothIssuerAndAccountCanNotBeEmpty;
@@ -358,6 +461,8 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
       final issuer = _issuerController.text.trim();
       final secret = _secretController.text.trim().replaceAll(' ', '');
       final notes = _notesController.text.trim();
+      final digits = int.tryParse(_digitsController.text.trim());
+
       final isStreamCode = issuer.toLowerCase() == "steam" ||
           issuer.toLowerCase().contains('steampowered.com');
       final CodeDisplay display =
@@ -398,14 +503,18 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
               issuer,
               secret,
               display,
-              isStreamCode ? Code.steamDigits : Code.defaultDigits,
+              isStreamCode ? Code.steamDigits : digits!,
+              algorithm: _algorithm,
             )
           : widget.code!.copyWith(
               account: account,
               issuer: issuer,
               secret: secret,
               display: display,
+              algorithm: _algorithm,
+              digits: digits!,
             );
+
       // Verify the validity of the code
       getOTP(newCode);
       Navigator.of(context).pop(newCode);

auth/lib/services/auth_feature_flag.dart

@@ -1,23 +0,0 @@
-import 'package:ente_auth/core/configuration.dart';
-import 'package:flutter/foundation.dart';
-
-class FeatureFlagService {
-  FeatureFlagService._privateConstructor();
-  static final FeatureFlagService instance =
-      FeatureFlagService._privateConstructor();
-
-  static final _internalUserIDs = const String.fromEnvironment(
-    "internal_user_ids",
-    defaultValue: "1,2,3,4,191,125,1580559962388044,1580559962392434,10000025",
-  ).split(",").map((element) {
-    return int.parse(element);
-  }).toSet();
-
-  bool isInternalUserOrDebugBuild() {
-    final String? email = Configuration.instance.getEmail();
-    final userID = Configuration.instance.getUserID();
-    return (email != null && email.endsWith("@ente.io")) ||
-        _internalUserIDs.contains(userID) ||
-        kDebugMode;
-  }
-}

auth/lib/services/user_service.dart

@@ -350,6 +350,7 @@ class UserService {
             userPassword,
             _config.getKeyAttributes()!,
           );
+          _config.resetVolatilePassword();
           page = const HomePage();
         } else {
           throw Exception("unexpected response during passkey verification");

auth/lib/store/user_store.dart

@@ -1,14 +0,0 @@
-import 'package:shared_preferences/shared_preferences.dart';
-
-class UserStore {
-  UserStore._privateConstructor();
-
-  // ignore: unused_field
-  late SharedPreferences _preferences;
-
-  static final UserStore instance = UserStore._privateConstructor();
-
-  Future<void> init() async {
-    _preferences = await SharedPreferences.getInstance();
-  }
-}

auth/lib/ui/account/login_pwd_verification_page.dart

@@ -113,7 +113,7 @@ class _LoginPasswordVerificationPageState
         );
       } else {
         _logger.severe('API failure during SRP login', e, s);
-        if (e.type == DioExceptionType.unknown) {
+        if (e.type == DioExceptionType.connectionError) {
           await _showContactSupportDialog(
             context,
             context.l10n.noInternetConnection,

auth/lib/ui/algorithm_selector_widget.dart

@@ -0,0 +1,72 @@
+import 'package:ente_auth/models/code.dart';
+import 'package:ente_auth/theme/ente_theme.dart';
+import 'package:flutter/material.dart';
+
+class AlgorithmSelectorWidget extends StatelessWidget {
+  final Algorithm currentAlgorithm;
+  final void Function(Algorithm) onSelected;
+  const AlgorithmSelectorWidget({
+    super.key,
+    required this.currentAlgorithm,
+    required this.onSelected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    Text algorithmOptionText(Algorithm algorithm) {
+      return Text(
+        algorithm.name.toUpperCase(),
+        style: getEnteTextTheme(context).small,
+      );
+    }
+
+    return GestureDetector(
+      onTapDown: (TapDownDetails details) async {
+        final int? selectedValue = await showMenu<int>(
+          context: context,
+          position: RelativeRect.fromLTRB(
+            details.globalPosition.dx,
+            details.globalPosition.dy,
+            details.globalPosition.dx,
+            details.globalPosition.dy + 300,
+          ),
+          items: List.generate(Algorithm.values.length, (index) {
+            return PopupMenuItem(
+              value: index,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  algorithmOptionText(Algorithm.values[index]),
+                  if (Algorithm.values[index] == currentAlgorithm)
+                    Icon(
+                      Icons.check,
+                      color: Theme.of(context).iconTheme.color,
+                    ),
+                ],
+              ),
+            );
+          }),
+        );
+        if (selectedValue != null) {
+          onSelected(Algorithm.values[selectedValue]);
+        }
+      },
+      child: Container(
+        padding: const EdgeInsets.only(bottom: 4),
+        decoration: BoxDecoration(
+          border: Border(
+            bottom: BorderSide(color: Theme.of(context).dividerColor),
+          ),
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            algorithmOptionText(currentAlgorithm),
+            const SizedBox(width: 8),
+            const Icon(Icons.arrow_drop_down),
+          ],
+        ),
+      ),
+    );
+  }
+}

auth/lib/ui/common/bottom_shadow.dart

@@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-
-class BottomShadowWidget extends StatelessWidget {
-  final double offsetDy;
-  final Color? shadowColor;
-  const BottomShadowWidget({this.offsetDy = 28, this.shadowColor, super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      height: 8,
-      decoration: BoxDecoration(
-        color: Colors.transparent,
-        boxShadow: [
-          BoxShadow(
-            color: shadowColor ?? Theme.of(context).colorScheme.surface,
-            spreadRadius: 42,
-            blurRadius: 42,
-            offset: Offset(0, offsetDy), // changes position of shadow
-          ),
-        ],
-      ),
-    );
-  }
-}

auth/lib/ui/common/linear_progress_dialog.dart

@@ -1,49 +0,0 @@
-import 'package:ente_auth/ente_theme_data.dart';
-import 'package:flutter/material.dart';
-
-class LinearProgressDialog extends StatefulWidget {
-  final String message;
-
-  const LinearProgressDialog(this.message, {super.key});
-
-  @override
-  LinearProgressDialogState createState() => LinearProgressDialogState();
-}
-
-class LinearProgressDialogState extends State<LinearProgressDialog> {
-  double? _progress;
-
-  @override
-  void initState() {
-    _progress = 0;
-    super.initState();
-  }
-
-  void setProgress(double progress) {
-    setState(() {
-      _progress = progress;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return PopScope(
-      canPop: false,
-      child: AlertDialog(
-        title: Text(
-          widget.message,
-          style: const TextStyle(
-            fontSize: 16,
-          ),
-          textAlign: TextAlign.center,
-        ),
-        content: LinearProgressIndicator(
-          value: _progress,
-          valueColor: AlwaysStoppedAnimation<Color>(
-            Theme.of(context).colorScheme.alternativeColor,
-          ),
-        ),
-      ),
-    );
-  }
-}

auth/lib/ui/common/rename_dialog.dart

@@ -1,98 +0,0 @@
-
-
-import 'package:ente_auth/utils/dialog_util.dart';
-import 'package:flutter/material.dart';
-
-class RenameDialog extends StatefulWidget {
-  final String name;
-  final String type;
-  final int maxLength;
-
-  const RenameDialog(this.name, this.type, {super.key, this.maxLength = 100});
-
-  @override
-  State<RenameDialog> createState() => _RenameDialogState();
-}
-
-class _RenameDialogState extends State<RenameDialog> {
-  String? _newName;
-
-  @override
-  void initState() {
-    super.initState();
-    _newName = widget.name;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text("Enter a new name"),
-      content: SingleChildScrollView(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            TextFormField(
-              decoration: InputDecoration(
-                hintText: '${widget.type} name',
-                hintStyle: const TextStyle(
-                  color: Colors.white30,
-                ),
-                contentPadding: const EdgeInsets.all(12),
-              ),
-              onChanged: (value) {
-                setState(() {
-                  _newName = value;
-                });
-              },
-              autocorrect: false,
-              keyboardType: TextInputType.text,
-              initialValue: _newName,
-              autofocus: true,
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          child: const Text(
-            "Cancel",
-            style: TextStyle(
-              color: Colors.redAccent,
-            ),
-          ),
-          onPressed: () {
-            Navigator.of(context).pop(null);
-          },
-        ),
-        TextButton(
-          child: Text(
-            "Rename",
-            style: TextStyle(
-              color: Theme.of(context).colorScheme.onSurface,
-            ),
-          ),
-          onPressed: () {
-            if (_newName!.trim().isEmpty) {
-              showErrorDialog(
-                context,
-                "Empty name",
-                "${widget.type} name cannot be empty",
-              );
-              return;
-            }
-            if (_newName!.trim().length > widget.maxLength) {
-              showErrorDialog(
-                context,
-                "Name too large",
-                "${widget.type} name should be less than ${widget.maxLength} characters",
-              );
-              return;
-            }
-            Navigator.of(context).pop(_newName!.trim());
-          },
-        ),
-      ],
-    );
-  }
-}

auth/lib/ui/components/home_header_widget.dart

@@ -1,41 +0,0 @@
-import 'package:ente_auth/core/event_bus.dart';
-import 'package:ente_auth/events/opened_settings_event.dart';
-import 'package:flutter/material.dart';
-
-class HomeHeaderWidget extends StatefulWidget {
-  final Widget centerWidget;
-  const HomeHeaderWidget({required this.centerWidget, super.key});
-
-  @override
-  State<HomeHeaderWidget> createState() => _HomeHeaderWidgetState();
-}
-
-class _HomeHeaderWidgetState extends State<HomeHeaderWidget> {
-  @override
-  Widget build(BuildContext context) {
-    final hasNotch = View.of(context).viewPadding.top > 65;
-    return Padding(
-      padding: EdgeInsets.fromLTRB(4, hasNotch ? 4 : 8, 4, 4),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          IconButton(
-            visualDensity: const VisualDensity(horizontal: -2, vertical: -2),
-            onPressed: () {
-              Scaffold.of(context).openDrawer();
-              Bus.instance.fire(OpenedSettingsEvent());
-            },
-            splashColor: Colors.transparent,
-            icon: const Icon(
-              Icons.menu_outlined,
-            ),
-          ),
-          AnimatedSwitcher(
-            duration: const Duration(milliseconds: 250),
-            child: widget.centerWidget,
-          ),
-        ],
-      ),
-    );
-  }
-}

auth/lib/ui/settings/danger_section_widget.dart

@@ -1,69 +0,0 @@
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/services/user_service.dart';
-import 'package:ente_auth/theme/ente_theme.dart';
-import 'package:ente_auth/ui/account/delete_account_page.dart';
-import 'package:ente_auth/ui/components/captioned_text_widget.dart';
-import 'package:ente_auth/ui/components/expandable_menu_item_widget.dart';
-import 'package:ente_auth/ui/components/menu_item_widget.dart';
-import 'package:ente_auth/ui/settings/common_settings.dart';
-import 'package:ente_auth/utils/dialog_util.dart';
-import 'package:ente_auth/utils/navigation_util.dart';
-import 'package:flutter/material.dart';
-
-class DangerSectionWidget extends StatelessWidget {
-  const DangerSectionWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ExpandableMenuItemWidget(
-      title: context.l10n.exit,
-      selectionOptionsWidget: _getSectionOptions(context),
-      leadingIcon: Icons.logout_outlined,
-    );
-  }
-
-  Widget _getSectionOptions(BuildContext context) {
-    return Column(
-      children: [
-        sectionOptionSpacing,
-        MenuItemWidget(
-          captionedTextWidget: CaptionedTextWidget(
-            title: context.l10n.logout,
-          ),
-          pressedColor: getEnteColorScheme(context).fillFaint,
-          trailingIcon: Icons.chevron_right_outlined,
-          trailingIconIsMuted: true,
-          onTap: () async {
-            _onLogoutTapped(context);
-          },
-        ),
-        sectionOptionSpacing,
-        MenuItemWidget(
-          captionedTextWidget: CaptionedTextWidget(
-            title: context.l10n.deleteAccount,
-          ),
-          pressedColor: getEnteColorScheme(context).fillFaint,
-          trailingIcon: Icons.chevron_right_outlined,
-          trailingIconIsMuted: true,
-          onTap: () async {
-            // ignore: unawaited_futures
-            routeToPage(context, const DeleteAccountPage());
-          },
-        ),
-        sectionOptionSpacing,
-      ],
-    );
-  }
-
-  void _onLogoutTapped(BuildContext context) {
-    showChoiceActionSheet(
-      context,
-      title: context.l10n.areYouSureYouWantToLogout,
-      firstButtonLabel: context.l10n.yesLogout,
-      isCritical: true,
-      firstButtonOnTap: () async {
-        await UserService.instance.logout(context);
-      },
-    );
-  }
-}

auth/lib/ui/settings/debug_section_widget.dart

@@ -1,94 +0,0 @@
-import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/ui/settings/common_settings.dart';
-import 'package:ente_auth/ui/settings/settings_section_title.dart';
-import 'package:ente_auth/ui/settings/settings_text_item.dart';
-import 'package:ente_crypto_dart/ente_crypto_dart.dart';
-import 'package:expandable/expandable.dart';
-import 'package:flutter/material.dart';
-
-class DebugSectionWidget extends StatelessWidget {
-  const DebugSectionWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    // This is a debug only section not shown to end users, so these strings are
-    // not translated.
-    return ExpandablePanel(
-      header: const SettingsSectionTitle("Debug"),
-      collapsed: Container(),
-      expanded: _getSectionOptions(context),
-      theme: getExpandableTheme(),
-    );
-  }
-
-  Widget _getSectionOptions(BuildContext context) {
-    return Column(
-      children: [
-        GestureDetector(
-          behavior: HitTestBehavior.translucent,
-          onTap: () async {
-            _showKeyAttributesDialog(context);
-          },
-          child: const SettingsTextItem(
-            text: "Key attributes",
-            icon: Icons.navigate_next,
-          ),
-        ),
-      ],
-    );
-  }
-
-  void _showKeyAttributesDialog(BuildContext context) {
-    final l10n = context.l10n;
-    final keyAttributes = Configuration.instance.getKeyAttributes()!;
-    final AlertDialog alert = AlertDialog(
-      title: const Text("key attributes"),
-      content: SingleChildScrollView(
-        child: Column(
-          children: [
-            const Text(
-              "Key",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(CryptoUtil.bin2base64(Configuration.instance.getKey()!)),
-            const Padding(padding: EdgeInsets.all(12)),
-            const Text(
-              "Encrypted Key",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(keyAttributes.encryptedKey),
-            const Padding(padding: EdgeInsets.all(12)),
-            const Text(
-              "Key Decryption Nonce",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(keyAttributes.keyDecryptionNonce),
-            const Padding(padding: EdgeInsets.all(12)),
-            const Text(
-              "KEK Salt",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(keyAttributes.kekSalt),
-            const Padding(padding: EdgeInsets.all(12)),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          child: Text(l10n.ok),
-          onPressed: () {
-            Navigator.of(context, rootNavigator: true).pop('dialog');
-          },
-        ),
-      ],
-    );
-
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return alert;
-      },
-    );
-  }
-}

auth/lib/ui/settings/made_with_love_widget.dart

@@ -1,34 +0,0 @@
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class MadeWithLoveWidget extends StatelessWidget {
-  const MadeWithLoveWidget({
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-    return GestureDetector(
-      onTap: () {
-        launchUrl(Uri.parse("https://ente.io"));
-      },
-      child: RichText(
-        text: TextSpan(
-          text: l10n.madeWithLoveAtPrefix,
-          style: DefaultTextStyle.of(context).style,
-          children: const <TextSpan>[
-            TextSpan(
-              text: 'ente.io',
-              style: TextStyle(
-                fontWeight: FontWeight.bold,
-                color: Colors.green,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

auth/lib/ui/settings/settings_text_item.dart

@@ -1,35 +0,0 @@
-
-
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-
-class SettingsTextItem extends StatelessWidget {
-  final String text;
-  final IconData icon;
-  const SettingsTextItem({
-    super.key,
-    required this.text,
-    required this.icon,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Padding(padding: EdgeInsets.all(Platform.isIOS ? 4 : 6)),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Align(
-              alignment: Alignment.centerLeft,
-              child: Text(text, style: Theme.of(context).textTheme.titleMedium),
-            ),
-            Icon(icon),
-          ],
-        ),
-        Padding(padding: EdgeInsets.all(Platform.isIOS ? 4 : 6)),
-      ],
-    );
-  }
-}

auth/lib/ui/settings/support_dev_widget.dart

@@ -1,83 +0,0 @@
-import 'package:dotted_border/dotted_border.dart';
-import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/models/subscription.dart';
-import 'package:ente_auth/services/billing_service.dart';
-import 'package:ente_auth/theme/ente_theme.dart';
-import 'package:flutter/material.dart';
-import 'package:styled_text/styled_text.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class SupportDevWidget extends StatelessWidget {
-  const SupportDevWidget({
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-
-    // fetch
-    if (Configuration.instance.hasConfiguredAccount()) {
-      return FutureBuilder<Subscription>(
-        future: BillingService.instance.getSubscription(),
-        builder: (context, snapshot) {
-          if (snapshot.hasData) {
-            final subscription = snapshot.data;
-            if (subscription != null && subscription.productID == "free") {
-              return buildWidget(l10n, context);
-            }
-          }
-          return const SizedBox.shrink();
-        },
-      );
-    } else {
-      return buildWidget(l10n, context);
-    }
-  }
-
-  Widget buildWidget(AppLocalizations l10n, BuildContext context) {
-    return GestureDetector(
-      onTap: () {
-        launchUrl(Uri.parse("https://ente.io"));
-      },
-      child: DottedBorder(
-        borderType: BorderType.RRect,
-        radius: const Radius.circular(12),
-        padding: const EdgeInsets.all(6),
-        dashPattern: const <double>[3, 3],
-        color: getEnteColorScheme(context).primaryGreen,
-        child: ClipRRect(
-          borderRadius: const BorderRadius.all(Radius.circular(12)),
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 6),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                StyledText(
-                  text: l10n.supportDevs,
-                  style: getEnteTextTheme(context).large,
-                  tags: {
-                    'bold-green': StyledTextTag(
-                      style: TextStyle(
-                        fontWeight: FontWeight.bold,
-                        color: getEnteColorScheme(context).primaryGreen,
-                      ),
-                    ),
-                  },
-                ),
-                const Padding(padding: EdgeInsets.all(6)),
-                Text(
-                  l10n.supportDiscount,
-                  style: const TextStyle(
-                    color: Colors.grey,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

auth/lib/ui/settings_section_title.dart

@@ -1 +0,0 @@
-// TODO Implement this library.

auth/lib/utils/dialog_util.dart

@@ -113,12 +113,12 @@ String parseErrorForUI(
         if (dioError.response?.data["code"] != null) {
           errorInfo = "Reason: ${dioError.response!.data["code"]}";
         } else {
-          errorInfo = "Reason: ${dioError.response!.data}";
+          errorInfo = "Reason: ${dioError.response!.data.toString()}";
         }
-      } else if (dioError.type == DioExceptionType.unknown) {
-        errorInfo = "Reason: $dioError.error";
+      } else if (dioError.type == DioExceptionType.badCertificate) {
+        errorInfo = "Reason: ${dioError.error.toString()}";
       } else {
-        errorInfo = "Reason: $dioError.type";
+        errorInfo = "Reason: ${dioError.type.toString()}";
       }
     } else {
       if (kDebugMode) {

auth/pubspec.lock

@@ -250,10 +250,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   confetti:
     dependency: "direct main"
     description:
@@ -286,6 +286,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.1"
+  cronet_http:
+    dependency: transitive
+    description:
+      name: cronet_http
+      sha256: "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
   cross_file:
     dependency: transitive
     description:
@@ -310,6 +318,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  cupertino_http:
+    dependency: transitive
+    description:
+      name: cupertino_http
+      sha256: "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   dart_style:
     dependency: transitive
     description:
@@ -346,10 +362,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "5.7.0"
+    version: "5.8.0+1"
   dio_web_adapter:
     dependency: transitive
     description:
@@ -861,6 +877,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  http_profile:
+    dependency: transitive
+    description:
+      name: http_profile
+      sha256: "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   image:
     dependency: transitive
     description:
@@ -885,6 +909,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  jni:
+    dependency: transitive
+    description:
+      name: jni
+      sha256: f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.1"
   js:
     dependency: transitive
     description:
@@ -1061,6 +1093,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  native_dio_adapter:
+    dependency: "direct main"
+    description:
+      name: native_dio_adapter
+      sha256: "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   nested:
     dependency: transitive
     description:
@@ -1077,6 +1117,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   otp:
     dependency: "direct main"
     description:

auth/pubspec.yaml

@@ -21,7 +21,7 @@ dependencies:
   connectivity_plus: ^6.0.5
   convert: ^3.1.1
   device_info_plus: ^9.1.1
-  dio: ^5.4.0
+  dio: ^5.8.0+1
   dotted_border: ^2.0.0+2
   dropdown_button2: ^2.3.9
   email_validator: ^3.0.0
@@ -72,6 +72,7 @@ dependencies:
   logging: ^1.0.1
   modal_bottom_sheet: ^3.0.0
   move_to_background: ^1.0.2
+  native_dio_adapter: ^1.4.0
   otp: ^3.1.1
   package_info_plus: ^8.0.2
   password_strength: ^0.2.0

desktop/.github/workflows/desktop-release.yml

@@ -45,7 +45,6 @@ jobs:
                       "${{ startsWith(github.ref, 'refs/tags/v') &&
                       format('photosd-{0}', github.ref_name) || ( inputs.source
                       || 'main' ) }}"
-                  submodules: recursive
 
             - name: Setup node
               uses: actions/setup-node@v4

desktop/.prettierrc.json

@@ -1,6 +1,7 @@
 {
     "tabWidth": 4,
     "proseWrap": "always",
+    "objectWrap": "collapse",
     "plugins": [
         "prettier-plugin-organize-imports",
         "prettier-plugin-packagejson"

desktop/CHANGELOG.md

@@ -1,9 +1,17 @@
 # CHANGELOG
 
-## v1.7.10 (Unreleased)
+## v1.7.11 (Unreleased)
 
+- Improved file viewer.
+- Improved live photo experience.
 - .
 
+## v1.7.10
+
+- Speed up selection for large libraries.
+- Support Japanese translations.
+- Fix video thumbnail generation on drag and drop.
+
 ## v1.7.9
 
 - Light mode.

desktop/README.md

@@ -10,19 +10,21 @@ To know more about Ente, see [our main README](../README.md) or visit
 
 ## Building from source
 
-Fetch submodules
+Clone this repository and change to this directory
 
 ```sh
-git submodule update --init --recursive
+git clone https://github.com/ente-io/ente
+cd ente/desktop
 ```
 
-Install dependencies
+Install dependencies (requires Yarn v1):
 
 ```sh
 yarn install
 ```
 
-Run in development mode (supports hot reload for the renderer process)
+Now you can run in development mode (supports hot reload for the renderer
+process)
 
 ```sh
 yarn dev

desktop/eslint.config.mjs

@@ -27,23 +27,17 @@ export default ts.config(
             // Allow numbers to be used in template literals.
             "@typescript-eslint/restrict-template-expressions": [
                 "error",
-                {
-                    allowNumber: true,
-                },
+                { allowNumber: true },
             ],
             // Allow void expressions as the entire body of an arrow function.
             "@typescript-eslint/no-confusing-void-expression": [
                 "error",
-                {
-                    ignoreArrowShorthand: true,
-                },
+                { ignoreArrowShorthand: true },
             ],
             // Allow free standing ternary expressions.
             "@typescript-eslint/no-unused-expressions": [
                 "error",
-                {
-                    allowTernary: true,
-                },
+                { allowTernary: true },
             ],
         },
     },

desktop/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.10-beta",
+    "version": "1.7.11-beta",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",
@@ -8,11 +8,11 @@
     "main": "app/main.js",
     "scripts": {
         "build": "yarn build-renderer && yarn build-main",
-        "build:ci": "yarn build-renderer && tsc",
-        "build:quick": "yarn build-renderer && yarn build-main:quick",
         "build-main": "tsc && electron-builder",
         "build-main:quick": "tsc && electron-builder --dir --config.compression=store --config.mac.identity=null",
         "build-renderer": "cross-env-shell _ENTE_IS_DESKTOP=1 \"cd ../web && yarn install && yarn build:photos && cd ../desktop && shx rm -rf out && shx cp -r ../web/apps/photos/out out\"",
+        "build:ci": "yarn build-renderer && tsc",
+        "build:quick": "yarn build-renderer && yarn build-main:quick",
         "dev": "concurrently --kill-others --success first --names 'main,rndr' \"yarn dev-main\" \"yarn dev-renderer\"",
         "dev-main": "tsc && electron .",
         "dev-renderer": "cross-env-shell _ENTE_IS_DESKTOP=1 \"cd ../web && yarn install && yarn workspace photos next dev -p 3008\"",
@@ -31,7 +31,7 @@
         "clip-bpe-js": "^0.0.6",
         "comlink": "^4.4.2",
         "compare-versions": "^6.1.1",
-        "electron-log": "^5.3.0",
+        "electron-log": "^5.3.2",
         "electron-store": "^8.2.0",
         "electron-updater": "^6.4.0",
         "ffmpeg-static": "^5.2.0",
@@ -41,23 +41,22 @@
         "onnxruntime-node": "^1.20.1"
     },
     "devDependencies": {
-        "@eslint/js": "^9.19.0",
+        "@eslint/js": "^9.22.0",
         "@tsconfig/node20": "^20.1.4",
         "@types/auto-launch": "^5.0.5",
-        "@types/eslint__js": "^8.42.3",
         "@types/ffmpeg-static": "^3.0.3",
         "ajv": "^8.17.1",
         "concurrently": "^9.1.2",
         "cross-env": "^7.0.3",
-        "electron": "^34.1.1",
+        "electron": "^34.3.3",
         "electron-builder": "^26.0.0",
         "eslint": "^9",
-        "prettier": "3.4.2",
+        "prettier": "3.5.3",
         "prettier-plugin-organize-imports": "^4.1.0",
-        "prettier-plugin-packagejson": "^2.5.8",
+        "prettier-plugin-packagejson": "^2.5.10",
         "shx": "^0.3.4",
-        "typescript": "^5.7.2",
-        "typescript-eslint": "^8.23.0"
+        "typescript": "^5.8.2",
+        "typescript-eslint": "^8.26.1"
     },
     "packageManager": "yarn@1.22.22",
     "productName": "ente"

desktop/src/main.ts

@@ -247,12 +247,7 @@ const registerPrivilegedSchemes = () => {
                 corsEnabled: true,
             },
         },
-        {
-            scheme: "stream",
-            privileges: {
-                supportFetchAPI: true,
-            },
-        },
+        { scheme: "stream", privileges: { supportFetchAPI: true } },
     ]);
 };
 
@@ -409,10 +404,11 @@ const createMainWindow = () => {
     // "The unresponsive event is fired when Chromium detects that your
     //  webContents is not responding to input messages for > 30 seconds."
     window.webContents.on("unresponsive", () => {
-        log.error(
-            "MainWindow's webContents are unresponsive, will restart the renderer process",
-        );
-        window.webContents.forcefullyCrashRenderer();
+        // There is a known case when this can happen: When the user to select a
+        // folder to upload (Upload > Folder), the browser callback to us takes
+        // some time. When trying to upload very large folders on slower Windows
+        // machines, this can take up to 30 seconds.
+        log.warn("MainWindow's webContents are unresponsive");
     });
 
     window.on("close", (event) => {

desktop/src/main/ipc.ts

@@ -41,6 +41,7 @@ import {
     fsRm,
     fsRmdir,
     fsWriteFile,
+    fsWriteFileViaBackup,
 } from "./services/fs";
 import { convertToJPEG, generateImageThumbnail } from "./services/image";
 import { logout } from "./services/logout";
@@ -154,6 +155,12 @@ export const attachIPCHandlers = () => {
         fsWriteFile(path, contents),
     );
 
+    ipcMain.handle(
+        "fsWriteFileViaBackup",
+        (_, path: string, contents: string) =>
+            fsWriteFileViaBackup(path, contents),
+    );
+
     ipcMain.handle("fsIsDir", (_, dirPath: string) => fsIsDir(dirPath));
 
     ipcMain.handle("fsFindFiles", (_, folderPath: string) =>

desktop/src/main/menu.ts

@@ -36,17 +36,9 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
         {
             label: "Ente Photos",
             submenu: [
-                ...macOSOnly([
-                    {
-                        label: "About Ente",
-                        role: "about",
-                    },
-                ]),
+                ...macOSOnly([{ label: "About Ente", role: "about" }]),
                 { type: "separator" },
-                {
-                    label: "Check for Updates...",
-                    click: handleCheckForUpdates,
-                },
+                { label: "Check for Updates...", click: handleCheckForUpdates },
                 { type: "separator" },
 
                 ...macOSOnly([
@@ -65,20 +57,11 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
 
                 { type: "separator" },
                 ...macOSOnly([
-                    {
-                        label: "Hide Ente",
-                        role: "hide",
-                    },
-                    {
-                        label: "Hide Others",
-                        role: "hideOthers",
-                    },
+                    { label: "Hide Ente", role: "hide" },
+                    { label: "Hide Others", role: "hideOthers" },
                     { type: "separator" },
                 ]),
-                {
-                    label: "Quit",
-                    role: "quit",
-                },
+                { label: "Quit", role: "quit" },
             ],
         },
         {
@@ -96,14 +79,8 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
                     {
                         label: "Speech",
                         submenu: [
-                            {
-                                role: "startSpeaking",
-                                label: "Start Speaking",
-                            },
-                            {
-                                role: "stopSpeaking",
-                                label: "Stop Speaking",
-                            },
+                            { role: "startSpeaking", label: "Start Speaking" },
+                            { role: "stopSpeaking", label: "Stop Speaking" },
                         ],
                     },
                 ]),
@@ -132,15 +109,7 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
                 ]),
             ],
         },
-        {
-            label: "Help",
-            submenu: [
-                {
-                    label: "Ente Help",
-                    click: handleHelp,
-                },
-            ],
-        },
+        { label: "Help", submenu: [{ label: "Ente Help", click: handleHelp }] },
     ]);
 };
 
@@ -159,13 +128,7 @@ export const createTrayContextMenu = (mainWindow: BrowserWindow) => {
     };
 
     return Menu.buildFromTemplate([
-        {
-            label: "Open Ente",
-            click: handleOpen,
-        },
-        {
-            label: "Quit Ente",
-            click: handleClose,
-        },
+        { label: "Open Ente", click: handleOpen },
+        { label: "Quit Ente", click: handleClose },
     ]);
 };

desktop/src/main/services/auto-launcher.ts

@@ -10,10 +10,7 @@ class AutoLauncher {
 
     constructor() {
         if (process.platform != "darwin") {
-            this.autoLaunch = new AutoLaunch({
-                name: "ente",
-                isHidden: true,
-            });
+            this.autoLaunch = new AutoLaunch({ name: "ente", isHidden: true });
         }
     }
 

desktop/src/main/services/fs.ts

@@ -24,6 +24,12 @@ export const fsReadTextFile = async (filePath: string) =>
 export const fsWriteFile = (path: string, contents: string) =>
     fs.writeFile(path, contents, { flush: true });
 
+export const fsWriteFileViaBackup = async (path: string, contents: string) => {
+    const backupPath = path + ".backup";
+    await fs.writeFile(backupPath, contents, { flush: true });
+    return fs.rename(backupPath, path);
+};
+
 export const fsIsDir = async (dirPath: string) => {
     if (!existsSync(dirPath)) return false;
     const stat = await fs.stat(dirPath);

desktop/src/main/services/ml-worker.ts

@@ -247,9 +247,7 @@ export const computeCLIPImageEmbedding = async (
 ) => {
     const session = await cachedCLIPImageSession();
     const inputArray = new Uint8Array(input.buffer);
-    const feeds = {
-        input: new ort.Tensor("uint8", inputArray, inputShape),
-    };
+    const feeds = { input: new ort.Tensor("uint8", inputArray, inputShape) };
     const t = Date.now();
     const results = await session.run(feeds);
     log.debugString(`ONNX/CLIP image embedding took ${Date.now() - t} ms`);
@@ -292,9 +290,7 @@ export const computeCLIPTextEmbeddingIfAvailable = async (text: string) => {
     const session = sessionOrSkip;
     const tokenizer = getTokenizer();
     const tokenizedText = Int32Array.from(tokenizer.encodeForCLIP(text));
-    const feeds = {
-        input: new ort.Tensor("int32", tokenizedText, [1, 77]),
-    };
+    const feeds = { input: new ort.Tensor("int32", tokenizedText, [1, 77]) };
 
     const t = Date.now();
     const results = await session.run(feeds);
@@ -316,9 +312,7 @@ export const detectFaces = async (
 ) => {
     const session = await cachedFaceDetectionSession();
     const inputArray = new Uint8Array(input.buffer);
-    const feeds = {
-        input: new ort.Tensor("uint8", inputArray, inputShape),
-    };
+    const feeds = { input: new ort.Tensor("uint8", inputArray, inputShape) };
     const t = Date.now();
     const results = await session.run(feeds);
     log.debugString(`ONNX/YOLO face detection took ${Date.now() - t} ms`);

desktop/src/main/services/upload.ts

@@ -84,11 +84,7 @@ export const pendingUploads = async (): Promise<PendingUploads | undefined> => {
 
     if (filePaths.length == 0 && zipItems.length == 0) return undefined;
 
-    return {
-        collectionName,
-        filePaths,
-        zipItems,
-    };
+    return { collectionName, filePaths, zipItems };
 };
 
 /**

desktop/src/main/stores/safe-storage.ts

@@ -5,9 +5,7 @@ interface SafeStorageStore {
 }
 
 const safeStorageSchema: Schema<SafeStorageStore> = {
-    encryptionKey: {
-        type: "string",
-    },
+    encryptionKey: { type: "string" },
 };
 
 export const safeStorageStore = new Store({

desktop/src/main/stores/upload-status.ts

@@ -22,30 +22,13 @@ export interface UploadStatusStore {
 }
 
 const uploadStatusSchema: Schema<UploadStatusStore> = {
-    collectionName: {
-        type: "string",
-    },
-    filePaths: {
-        type: "array",
-        items: {
-            type: "string",
-        },
-    },
+    collectionName: { type: "string" },
+    filePaths: { type: "array", items: { type: "string" } },
     zipItems: {
         type: "array",
-        items: {
-            type: "array",
-            items: {
-                type: "string",
-            },
-        },
-    },
-    zipPaths: {
-        type: "array",
-        items: {
-            type: "string",
-        },
+        items: { type: "array", items: { type: "string" } },
     },
+    zipPaths: { type: "array", items: { type: "string" } },
 };
 
 export const uploadStatusStore = new Store({

desktop/src/main/stores/user-preferences.ts

@@ -23,12 +23,7 @@ interface UserPreferences {
      * the app is not maximized (when the app was maximized when it was being
      * quit then {@link isWindowMaximized} will be set instead).
      */
-    windowBounds?: {
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-    };
+    windowBounds?: { x: number; y: number; width: number; height: number };
     /**
      * `true` if the app's main window is maximized the last time it was closed.
      */

desktop/src/main/stores/watch.ts

@@ -34,10 +34,7 @@ const watchStoreSchema: Schema<WatchStore> = {
                         },
                     },
                 },
-                ignoredFiles: {
-                    type: "array",
-                    items: { type: "string" },
-                },
+                ignoredFiles: { type: "array", items: { type: "string" } },
             },
         },
     },

desktop/src/main/stream.ts

@@ -125,7 +125,12 @@ const handleReadZip = async (zipPath: string, entryName: string) => {
     const { writable, readable } = new TransformStream();
     const stream = await zip.stream(entry);
 
-    const nodeWritable = Writable.fromWeb(writable);
+    // Silence a type error about the Promise<void> returned by the close method
+    // of writable as not being assignable to Promise<undefined> which started
+    // appearing after updating to TypeScript 5.8.
+    //
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
+    const nodeWritable = Writable.fromWeb(writable as any);
     stream.pipe(nodeWritable);
 
     nodeWritable.on("error", (e: unknown) => {

desktop/src/preload.ts

@@ -178,6 +178,9 @@ const fsReadTextFile = (path: string) =>
 const fsWriteFile = (path: string, contents: string) =>
     ipcRenderer.invoke("fsWriteFile", path, contents);
 
+const fsWriteFileViaBackup = (path: string, contents: string) =>
+    ipcRenderer.invoke("fsWriteFileViaBackup", path, contents);
+
 const fsIsDir = (dirPath: string) => ipcRenderer.invoke("fsIsDir", dirPath);
 
 // - Conversion
@@ -373,6 +376,7 @@ contextBridge.exposeInMainWorld("electron", {
         rm: fsRm,
         readTextFile: fsReadTextFile,
         writeFile: fsWriteFile,
+        writeFileViaBackup: fsWriteFileViaBackup,
         isDir: fsIsDir,
         findFiles: fsFindFiles,
     },

desktop/yarn.lock

@@ -177,10 +177,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.9.1.tgz#4a97e85e982099d6c7ee8410aacb55adaa576f06"
   integrity sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==
 
-"@eslint/js@^9.19.0":
-  version "9.19.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.19.0.tgz#51dbb140ed6b49d05adc0b171c41e1a8713b7789"
-  integrity sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==
+"@eslint/js@^9.22.0":
+  version "9.22.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.22.0.tgz#4ff53649ded7cbce90b444b494c234137fa1aa3d"
+  integrity sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==
 
 "@eslint/object-schema@^2.1.4":
   version "2.1.4"
@@ -317,26 +317,6 @@
   dependencies:
     "@types/ms" "*"
 
-"@types/eslint@*":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
-  integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/eslint__js@^8.42.3":
-  version "8.42.3"
-  resolved "https://registry.yarnpkg.com/@types/eslint__js/-/eslint__js-8.42.3.tgz#d1fa13e5c1be63a10b4e3afe992779f81c1179a0"
-  integrity sha512-alfG737uhmPdnvkrLdZLcEKJ/B8s9Y4hrZ+YAdzUeoArBlSUERA2E87ROfOaS4jd/C45fzOoZzidLc1IPwLqOw==
-  dependencies:
-    "@types/eslint" "*"
-
-"@types/estree@*":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-
 "@types/ffmpeg-static@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/ffmpeg-static/-/ffmpeg-static-3.0.3.tgz#605358ac6304507a75c2fd5fd861534837b19e2f"
@@ -354,11 +334,6 @@
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4"
   integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==
 
-"@types/json-schema@*":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
-
 "@types/keyv@^3.1.4":
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
@@ -417,62 +392,62 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.23.0.tgz#7745f4e3e4a7ae5f6f73fefcd856fd6a074189b7"
-  integrity sha512-vBz65tJgRrA1Q5gWlRfvoH+w943dq9K1p1yDBY2pc+a1nbBLZp7fB9+Hk8DaALUbzjqlMfgaqlVPT1REJdkt/w==
+"@typescript-eslint/eslint-plugin@8.26.1":
+  version "8.26.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.1.tgz#3e48eb847924161843b092c87a9b65176b53782f"
+  integrity sha512-2X3mwqsj9Bd3Ciz508ZUtoQQYpOhU/kWoUqIf49H8Z0+Vbh6UF/y0OEYp0Q0axOGzaBGs7QxRwq0knSQ8khQNA==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.23.0"
-    "@typescript-eslint/type-utils" "8.23.0"
-    "@typescript-eslint/utils" "8.23.0"
-    "@typescript-eslint/visitor-keys" "8.23.0"
+    "@typescript-eslint/scope-manager" "8.26.1"
+    "@typescript-eslint/type-utils" "8.26.1"
+    "@typescript-eslint/utils" "8.26.1"
+    "@typescript-eslint/visitor-keys" "8.26.1"
     graphemer "^1.4.0"
     ignore "^5.3.1"
     natural-compare "^1.4.0"
     ts-api-utils "^2.0.1"
 
-"@typescript-eslint/parser@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.23.0.tgz#57acb3b65fce48d12b70d119436e145842a30081"
-  integrity sha512-h2lUByouOXFAlMec2mILeELUbME5SZRN/7R9Cw2RD2lRQQY08MWMM+PmVVKKJNK1aIwqTo9t/0CvOxwPbRIE2Q==
+"@typescript-eslint/parser@8.26.1":
+  version "8.26.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.26.1.tgz#0e2f915a497519fc43f52cf2ecbfa607ff56f72e"
+  integrity sha512-w6HZUV4NWxqd8BdeFf81t07d7/YV9s7TCWrQQbG5uhuvGUAW+fq1usZ1Hmz9UPNLniFnD8GLSsDpjP0hm1S4lQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.23.0"
-    "@typescript-eslint/types" "8.23.0"
-    "@typescript-eslint/typescript-estree" "8.23.0"
-    "@typescript-eslint/visitor-keys" "8.23.0"
+    "@typescript-eslint/scope-manager" "8.26.1"
+    "@typescript-eslint/types" "8.26.1"
+    "@typescript-eslint/typescript-estree" "8.26.1"
+    "@typescript-eslint/visitor-keys" "8.26.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.23.0.tgz#ee3bb7546421ca924b9b7a8b62a77d388193ddec"
-  integrity sha512-OGqo7+dXHqI7Hfm+WqkZjKjsiRtFUQHPdGMXzk5mYXhJUedO7e/Y7i8AK3MyLMgZR93TX4bIzYrfyVjLC+0VSw==
+"@typescript-eslint/scope-manager@8.26.1":
+  version "8.26.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.26.1.tgz#5e6ad0ac258ccf79462e91c3f43a3f1f7f31a6cc"
+  integrity sha512-6EIvbE5cNER8sqBu6V7+KeMZIC1664d2Yjt+B9EWUXrsyWpxx4lEZrmvxgSKRC6gX+efDL/UY9OpPZ267io3mg==
   dependencies:
-    "@typescript-eslint/types" "8.23.0"
-    "@typescript-eslint/visitor-keys" "8.23.0"
+    "@typescript-eslint/types" "8.26.1"
+    "@typescript-eslint/visitor-keys" "8.26.1"
 
-"@typescript-eslint/type-utils@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.23.0.tgz#271e1eecece072d92679dfda5ccfceac3faa9f76"
-  integrity sha512-iIuLdYpQWZKbiH+RkCGc6iu+VwscP5rCtQ1lyQ7TYuKLrcZoeJVpcLiG8DliXVkUxirW/PWlmS+d6yD51L9jvA==
+"@typescript-eslint/type-utils@8.26.1":
+  version "8.26.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.26.1.tgz#462f0bae09de72ac6e8e1af2ebe588c23224d7f8"
+  integrity sha512-Kcj/TagJLwoY/5w9JGEFV0dclQdyqw9+VMndxOJKtoFSjfZhLXhYjzsQEeyza03rwHx2vFEGvrJWJBXKleRvZg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "8.23.0"
-    "@typescript-eslint/utils" "8.23.0"
+    "@typescript-eslint/typescript-estree" "8.26.1"
+    "@typescript-eslint/utils" "8.26.1"
     debug "^4.3.4"
     ts-api-utils "^2.0.1"
 
-"@typescript-eslint/types@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.23.0.tgz#3355f6bcc5ebab77ef6dcbbd1113ec0a683a234a"
-  integrity sha512-1sK4ILJbCmZOTt9k4vkoulT6/y5CHJ1qUYxqpF1K/DBAd8+ZUL4LlSCxOssuH5m4rUaaN0uS0HlVPvd45zjduQ==
+"@typescript-eslint/types@8.26.1":
+  version "8.26.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.26.1.tgz#d5978721670cff263348d5062773389231a64132"
+  integrity sha512-n4THUQW27VmQMx+3P+B0Yptl7ydfceUj4ON/AQILAASwgYdZ/2dhfymRMh5egRUrvK5lSmaOm77Ry+lmXPOgBQ==
 
-"@typescript-eslint/typescript-estree@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.23.0.tgz#f633ef08efa656e386bc44b045ffcf9537cc6924"
-  integrity sha512-LcqzfipsB8RTvH8FX24W4UUFk1bl+0yTOf9ZA08XngFwMg4Kj8A+9hwz8Cr/ZS4KwHrmo9PJiLZkOt49vPnuvQ==
+"@typescript-eslint/typescript-estree@8.26.1":
+  version "8.26.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.1.tgz#eb0e4ce31753683d83be53441a409fd5f0b34afd"
+  integrity sha512-yUwPpUHDgdrv1QJ7YQal3cMVBGWfnuCdKbXw1yyjArax3353rEJP1ZA+4F8nOlQ3RfS2hUN/wze3nlY+ZOhvoA==
   dependencies:
-    "@typescript-eslint/types" "8.23.0"
-    "@typescript-eslint/visitor-keys" "8.23.0"
+    "@typescript-eslint/types" "8.26.1"
+    "@typescript-eslint/visitor-keys" "8.26.1"
     debug "^4.3.4"
     fast-glob "^3.3.2"
     is-glob "^4.0.3"
@@ -480,22 +455,22 @@
     semver "^7.6.0"
     ts-api-utils "^2.0.1"
 
-"@typescript-eslint/utils@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.23.0.tgz#b269cbdc77129fd6e0e600b168b5ef740a625554"
-  integrity sha512-uB/+PSo6Exu02b5ZEiVtmY6RVYO7YU5xqgzTIVZwTHvvK3HsL8tZZHFaTLFtRG3CsV4A5mhOv+NZx5BlhXPyIA==
+"@typescript-eslint/utils@8.26.1":
+  version "8.26.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.26.1.tgz#54cc58469955f25577f659753b71a0e117a0539f"
+  integrity sha512-V4Urxa/XtSUroUrnI7q6yUTD3hDtfJ2jzVfeT3VK0ciizfK2q/zGC0iDh1lFMUZR8cImRrep6/q0xd/1ZGPQpg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.23.0"
-    "@typescript-eslint/types" "8.23.0"
-    "@typescript-eslint/typescript-estree" "8.23.0"
+    "@typescript-eslint/scope-manager" "8.26.1"
+    "@typescript-eslint/types" "8.26.1"
+    "@typescript-eslint/typescript-estree" "8.26.1"
 
-"@typescript-eslint/visitor-keys@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.23.0.tgz#40405fd26a61d23f5f4c2ed0f016a47074781df8"
-  integrity sha512-oWWhcWDLwDfu++BGTZcmXWqpwtkwb5o7fxUIGksMQQDSdPW9prsSnfIOZMlsj4vBOSrcnjIUZMiIjODgGosFhQ==
+"@typescript-eslint/visitor-keys@8.26.1":
+  version "8.26.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.1.tgz#c5267fcc82795cf10280363023837deacad2647c"
+  integrity sha512-AjOC3zfnxd6S4Eiy3jwktJPclqhFHNyd8L6Gycf9WUPoKZpgM5PjkxY1X7uSy61xVpiJDhhk7XT2NVsN3ALTWg==
   dependencies:
-    "@typescript-eslint/types" "8.23.0"
+    "@typescript-eslint/types" "8.26.1"
     eslint-visitor-keys "^4.2.0"
 
 "@xmldom/xmldom@^0.8.8":
@@ -1248,10 +1223,10 @@ electron-builder@^26.0.0:
     simple-update-notifier "2.0.0"
     yargs "^17.6.2"
 
-electron-log@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.3.0.tgz#503a911983db09156965595a7ee9a39f2d9d6384"
-  integrity sha512-ILgbh2k9IKbSaN8NAbQriVteEhmkdLo/e4J1dg+JIBTFzXS/kO8zNRZBh/4YPwIT/zeyxF1jP6Xz8GLsPE2IBQ==
+electron-log@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.3.2.tgz#76aa0091f9cbf0d304546ca6f271ebb6ad953bf4"
+  integrity sha512-EFI5MFFEzFJU5gyhJNpKQhfGfrRP9IWzSu0sSxrWXasWKvVAOFgBySafX8W1pbPKa/w8/DDPu2bBBtVZJdDsnw==
 
 electron-publish@26.0.0:
   version "26.0.0"
@@ -1289,10 +1264,10 @@ electron-updater@^6.4.0:
     semver "^7.6.3"
     tiny-typed-emitter "^2.1.0"
 
-electron@^34.1.1:
-  version "34.1.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-34.1.1.tgz#1fc766e406401834fedb9747c4ca58671d9a1e46"
-  integrity sha512-1aDYk9Gsv1/fFeClMrxWGoVMl7uCUgl1pe26BiTnLXmAoqEXCa3f3sCKFWV+cuDzUjQGAZcpkWhGYTgWUSQrLA==
+electron@^34.3.3:
+  version "34.3.3"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-34.3.3.tgz#2979329d182a195756bfbf6e5687a835cd65a2ec"
+  integrity sha512-7m1FiO1mwc1K/UqqnnkG7Ik/kAngDzmLfHwcl+xaWgCQ+Sts9rlEqzOh6g1GHhDqebrbs4bO/aU+NDi32fCciQ==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^20.9.0"
@@ -2694,18 +2669,18 @@ prettier-plugin-organize-imports@^4.1.0:
   resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-4.1.0.tgz#f3d3764046a8e7ba6491431158b9be6ffd83b90f"
   integrity sha512-5aWRdCgv645xaa58X8lOxzZoiHAldAPChljr/MT0crXVOWTZ+Svl4hIWlz+niYSlO6ikE5UXkN1JrRvIP2ut0A==
 
-prettier-plugin-packagejson@^2.5.8:
-  version "2.5.8"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.5.8.tgz#1b307fce044d0230ea8f3210f8a731c5cc1b288d"
-  integrity sha512-BaGOF63I0IJZoudxpuQe17naV93BRtK8b3byWktkJReKEMX9CC4qdGUzThPDVO/AUhPzlqDiAXbp18U6X8wLKA==
+prettier-plugin-packagejson@^2.5.10:
+  version "2.5.10"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.5.10.tgz#f47068d0aa12efcdddb802189d8adae874ba00e7"
+  integrity sha512-LUxATI5YsImIVSaaLJlJ3aE6wTD+nvots18U3GuQMJpUyClChaZlQrqx3dBnbhF20OnKWZyx8EgyZypQtBDtgQ==
   dependencies:
-    sort-package-json "2.14.0"
+    sort-package-json "2.15.1"
     synckit "0.9.2"
 
-prettier@3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.4.2.tgz#a5ce1fb522a588bf2b78ca44c6e6fe5aa5a2b13f"
-  integrity sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==
+prettier@3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.3.tgz#4fc2ce0d657e7a02e602549f053b239cb7dfe1b5"
+  integrity sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==
 
 proc-log@^2.0.1:
   version "2.0.1"
@@ -3015,10 +2990,10 @@ sort-object-keys@^1.1.3:
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
   integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
 
-sort-package-json@2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-2.14.0.tgz#ba0c7420dc6edea4b0eb7e9f502fda63f57586d8"
-  integrity sha512-xBRdmMjFB/KW3l51mP31dhlaiFmqkHLfWTfZAno8prb/wbDxwBPWFpxB16GZbiPbYr3wL41H8Kx22QIDWRe8WQ==
+sort-package-json@2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-2.15.1.tgz#e5a035fad7da277b1947b9eecc93ea09c1c2526e"
+  integrity sha512-9x9+o8krTT2saA9liI4BljNjwAbvUnWf11Wq+i/iZt8nl2UGYnf3TH5uBydE7VALmP7AGwlfszuEeL8BDyb0YA==
   dependencies:
     detect-indent "^7.0.1"
     detect-newline "^4.0.0"
@@ -3234,24 +3209,24 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript-eslint@^8.23.0:
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.23.0.tgz#796deb48f040146b68fcc8cb07db68b87219a8d2"
-  integrity sha512-/LBRo3HrXr5LxmrdYSOCvoAMm7p2jNizNfbIpCgvG4HMsnoprRUOce/+8VJ9BDYWW68rqIENE/haVLWPeFZBVQ==
+typescript-eslint@^8.26.1:
+  version "8.26.1"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.26.1.tgz#d17a638a7543bc535157b83cdf5876513c71493b"
+  integrity sha512-t/oIs9mYyrwZGRpDv3g+3K6nZ5uhKEMt2oNmAPwaY4/ye0+EH4nXIPYNtkYFS6QHm+1DFg34DbglYBz5P9Xysg==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.23.0"
-    "@typescript-eslint/parser" "8.23.0"
-    "@typescript-eslint/utils" "8.23.0"
+    "@typescript-eslint/eslint-plugin" "8.26.1"
+    "@typescript-eslint/parser" "8.26.1"
+    "@typescript-eslint/utils" "8.26.1"
 
 typescript@^5.4.3:
   version "5.5.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
   integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
 
-typescript@^5.7.2:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
-  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
+typescript@^5.8.2:
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4"
+  integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==
 
 undici-types@~6.19.2:
   version "6.19.8"

docs/docs/.vitepress/sidebar.ts

@@ -135,13 +135,14 @@ export const sidebar = [
                         link: "/photos/faq/hidden-and-archive",
                     },
                     {
-                        text: "Machine Learning",
-                        link: "/photos/faq/machine-learning",
+                        text: "Face recognition",
+                        link: "/photos/faq/face-recognition",
                     },
                     {
-                        text: "Video Streaming",
+                        text: "Video streaming",
                         link: "/photos/faq/video-streaming",
                     },
+                    { text: "Misc", link: "/photos/faq/misc" },
                 ],
             },
             {
@@ -267,6 +268,10 @@ export const sidebar = [
                         text: "Hosting Ente without Docker",
                         link: "/self-hosting/guides/standalone-ente",
                     },
+                    {
+                        text: "Ente via Tailscale (Community)",
+                        link: "/self-hosting/guides/Tailscale.md",
+                    },
                     {
                         text: "Configure CLI for Self Hosted Instance",
                         link: "/self-hosting/guides/selfhost-cli",
@@ -307,6 +312,10 @@ export const sidebar = [
                         text: "Uploads",
                         link: "/self-hosting/troubleshooting/uploads",
                     },
+                    {
+                        text: "Docker",
+                        link: "/self-hosting/troubleshooting/docker",
+                    },
                     {
                         text: "Yarn",
                         link: "/self-hosting/troubleshooting/yarn",

docs/docs/photos/faq/face-recognition.md

@@ -1,10 +1,10 @@
 ---
-title: Machine Learning FAQ
+title: Face recognition
 description:
-    Frequently asked questions about several features of Ente's ML suite
+    Frequently asked questions about Ente's face recognition
 ---
 
-# Machine Learning
+# Face recognition
 
 ## Can I merge or de-merge persons recognized by the app?
 
@@ -19,7 +19,7 @@ instead of typing the name again, tap on the already given name that should now
 be listed.
 
 De-merging a certain grouping can be done by going to the person, pressing
-`review suggestions` and then the top right `history icon`. Now press on the
+`Review suggestions` and then the top right `History icon`. Now press on the
 `minus icon` beside the group you want to de-merge.
 
 ### Desktop
@@ -29,6 +29,16 @@ selecting an existing person, and use the "Review suggestions" sheet to de-merge
 previously merged persons (click the top right history icon on the suggestion
 sheet to see the previous merges, and if necessary, undo them).
 
+## How can I remove an incorrectly grouped face from a person?
+
+On our mobile app, open up the person from the People section, click on the
+three dots to open up overflow menu, and click on Edit. Now you will be
+presented with the list of all photos that were merged to create this person.
+
+You can click on the merged photos and select the photos you think are
+incorrectly grouped (by long-pressing on them) and select "Remove" from the
+action bar that pops up to remove any incorrect faces.
+
 ## How do I change the cover for a recognized person?
 
 ### Mobile

docs/docs/photos/faq/general.md

@@ -112,3 +112,31 @@ https://github.com/ente-io/ente/tree/main/cli#readme.
 
 Currently, the Ente mobile app allows you to see a map view of all the albums by
 clicking on "Your map" under "Locations" on the search screen.
+
+## How to reset my password if I lost it?
+
+On the login page, enter your email and click on Forgot Password. Then, enter your recovery key and create a new password.
+
+ # iOS Album Backup and Organization in Ente
+
+ ### How does Ente handle photos that are part of multiple iOS albums?
+When you select multiple albums for backup, Ente prioritizes uploading each photo to the album with the fewest photos. This means a photo will only be uploaded once, even if it exists in multiple albums on your device. If you create new albums on your device after the initial backup, those photos may not appear in the corresponding Ente album if they were already uploaded to a different album.
+
+
+### Why don’t all photos from a new iOS album appear in the corresponding Ente album?
+If you create a new album on your device after the initial backup, the photos in that album may have already been uploaded to another album in Ente. To fix this, go to the "On Device" album in Ente, select all photos, and manually add them to the corresponding album in Ente.
+
+### What happens if I reorganize my photos in the iOS Photos app after backing up?
+Reorganizing photos in the iOS Photos app (e.g., moving photos to new albums) won’t automatically reflect in Ente. You’ll need to manually add those photos to the corresponding albums in Ente to maintain consistency.
+
+### Can I search for photos using the descriptions I’ve added?
+Yes, descriptions are searchable, making it easier to find specific photos later.
+To do this, open the photo, tap the (i) button, and enter your description.
+
+### How does the deduplication feature work on the desktop app?
+If the app finds exact duplicates, it will show them in the deduplication. When you delete a duplicate, the app keeps one copy and creates a symlink for the other duplicate. This helps save storage space.
+
+### What happens if I lose access to my email address? Can I use my recovery key to bypass email verification?
+No, the recovery key does not bypass email verification. For security reasons, we do not disable or bypass email verification unless the account owner reaches out to us and successfully verifies their identity by providing details about their account. 
+
+If you lose access to your email, please contact our support team at support@ente.io

docs/docs/photos/faq/hidden-and-archive.md

@@ -19,9 +19,6 @@ Keep in mind that hidden items will still show up in the "On device" albums
 within Ente as long as they are present in your native gallery. But once you
 remove them from your device, they'll stop showing up here.
 
-Hiding is currently only supported in the Ente mobile app, and items hidden from
-the mobile app will not be visible in the web and desktop app.
-
 For more details, see [features/hide](/photos/features/hide).
 
 ### Archive

docs/docs/photos/faq/metadata.md

@@ -1,12 +1,11 @@
 ---
 title: Metadata
-description: Handling of metadata, in particular creation dates, in Ente Photos
+description: Handling of metadata in Ente Photos
 ---
 
 # Metadata
 
-This document describes Ente's handling of metadata, in particular photo
-creation dates.
+This document describes Ente's handling of metadata
 
 ## Import
 
@@ -46,7 +45,7 @@ importing that folder into Ente**. This way, we will be able to always correctly
 map, for example, `flower.jpeg` and `flower.json` and show the same date for
 `flower.jpeg` that you would've seen within Google Photos.
 
-### Screenshots
+### File name
 
 In case the photo does not have a date in the Exif data (and it is not a Google
 takeout), for example, for screenshots or Whatsapp forwards, Ente will still try
@@ -57,6 +56,28 @@ and deduce the correct date for the file from the name of the file.
 > This process works great most of the time, but it is inherently based on
 > heuristics and is not exact.
 
+If we are unable to decipher the creation time from these 3 sources, we will set
+the upload time as the photo's creation time.
+
+## Modifications
+
+Ente supports modifications to the following metadata:
+- File name
+- Date & time
+- Location
+
+The first two options are available on both mobile and desktop, while the
+ability to update location is only available within our mobile apps.
+
+### Bulk modifications
+
+You can bulk-edit creation time of photos from our desktop app, by
+multi-selecting items and selecting the "Fix time" option from the action bar.
+
+You can bulk-edit location coordinates of photos from our mobile app, by
+multi-selecting items and selecting the "Edit location" option from the action
+bar.
+
 ## Export
 
 Ente guarantees that you will get back the _exact_ same original photos and