Merge branch 'main' into fix_auto_scaling

2024-03-06 19:09:27 +05:30 · 2024-03-06 19:09:27 +05:30 · d6fc57fc3f
commit d6fc57fc3f
parent 939e76d696 9feb5397a8
157 changed files with 14999 additions and 3423 deletions
--- a/.github/assets/github-badge.png
+++ b/.github/assets/github-badge.png
--- a/.github/assets/mastodon.svg
+++ b/.github/assets/mastodon.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="#6364ff" viewBox="0 0 16 16">
+  <path d="M11.19 12.195c2.016-.24 3.77-1.475 3.99-2.603.348-1.778.32-4.339.32-4.339 0-3.47-2.286-4.488-2.286-4.488C12.062.238 10.083.017 8.027 0h-.05C5.92.017 3.942.238 2.79.765c0 0-2.285 1.017-2.285 4.488l-.002.662c-.004.64-.007 1.35.011 2.091.083 3.394.626 6.74 3.78 7.57 1.454.383 2.703.463 3.709.408 1.823-.1 2.847-.647 2.847-.647l-.06-1.317s-1.303.41-2.767.36c-1.45-.05-2.98-.156-3.215-1.928a4 4 0 0 1-.033-.496s1.424.346 3.228.428c1.103.05 2.137-.064 3.188-.189zm1.613-2.47H11.13v-4.08c0-.859-.364-1.295-1.091-1.295-.804 0-1.207.517-1.207 1.541v2.233H7.168V5.89c0-1.024-.403-1.541-1.207-1.541-.727 0-1.091.436-1.091 1.296v4.079H3.197V5.522q0-1.288.66-2.046c.456-.505 1.052-.764 1.793-.764.856 0 1.504.328 1.933.983L8 4.39l.417-.695c.429-.655 1.077-.983 1.934-.983.74 0 1.336.259 1.791.764q.662.757.661 2.046z"/>
+</svg>
--- a/.github/assets/twitter.svg
+++ b/.github/assets/twitter.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="#1e9bf0" viewBox="0 0 16 16">
+  <path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334q.002-.211-.006-.422A6.7 6.7 0 0 0 16 3.542a6.7 6.7 0 0 1-1.889.518 3.3 3.3 0 0 0 1.447-1.817 6.5 6.5 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.32 9.32 0 0 1-6.767-3.429 3.29 3.29 0 0 0 1.018 4.382A3.3 3.3 0 0 1 .64 6.575v.045a3.29 3.29 0 0 0 2.632 3.218 3.2 3.2 0 0 1-.865.115 3 3 0 0 1-.614-.057 3.28 3.28 0 0 0 3.067 2.277A6.6 6.6 0 0 1 .78 13.58a6 6 0 0 1-.78-.045A9.34 9.34 0 0 0 5.026 15"/>
+</svg>
--- a/.github/workflows/auth-crowdin.yml
+++ b/.github/workflows/auth-crowdin.yml
@ -0,0 +1,41 @@
+name: "Sync Crowdin translations (auth)"
+
+on:
+    push:
+        paths:
+            # Run action when auth's intl_en.arb is changed
+            - "mobile/lib/l10n/arb/app_en.arb"
+            # Or the workflow itself is changed
+            - ".github/workflows/auth-crowdin.yml"
+        branches: [main]
+    schedule:
+        # Run every 24 hours - https://crontab.guru/#0_*/24_*_*_*
+        - cron: "0 */24 * * *"
+    workflow_dispatch: # Allow manually running the action
+
+jobs:
+    synchronize-with-crowdin:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Crowdin's action
+              uses: crowdin/github-action@v1
+              with:
+                  base_path: "auth/"
+                  config: "auth/crowdin.yml"
+                  upload_sources: true
+                  upload_translations: true
+                  download_translations: true
+                  localization_branch_name: crowdin-translations-auth
+                  create_pull_request: true
+                  skip_untranslated_strings: true
+                  pull_request_title: "[auth] New translations"
+                  pull_request_body: "New translations from [Crowdin](https://crowdin.com/project/ente-authenticator-app)"
+                  pull_request_base_branch_name: "main"
+                  project_id: 575169
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/.github/workflows/auth-lint.yml
+++ b/.github/workflows/auth-lint.yml
@ -0,0 +1,40 @@
+name: "Lint (auth)"
+
+on:
+    # Run on every push to branches (this also covers pull requests)
+    push:
+        # See: [Note: Specify branch when specifying a path filter]
+        branches: ["**"]
+        # Only run if something changes in these paths
+        paths:
+            - "auth/**"
+            - ".github/workflows/auth-lint.yml"
+
+env:
+    FLUTTER_VERSION: "3.16.9"
+
+jobs:
+    lint:
+        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
+
+            - run: flutter pub get
+
+            - run: flutter analyze --no-fatal-infos
+
+            - name: Verify custom icon JSON
+              run: cat assets/custom-icons/_data/custom-icons.json | jq empty
--- a/.github/workflows/auth-release.yml
+++ b/.github/workflows/auth-release.yml
@ -0,0 +1,291 @@
+name: "Release (auth)"
+
+# [Note: Testing release workflows that are triggered by tags]
+#
+# To test this out, push a tag with a pre-release version. The version number
+# should be the version number of the next actual release.
+#
+# > When major, minor, and patch are equal, a pre-release version has lower
+# > precedence than a normal version. Example: 1.0.0-alpha < 1.0.0.
+# > https://semver.org
+#
+# So if the next release we intend to put out is 1.2.3, you can:
+#
+#     git tag auth-v1.2.3-test
+#     git push origin auth-v1.2.3-test
+#
+# We use a suffix like `-test` to indicate that these are test tags, and that
+# they belong to a pre-release.
+#
+# If you need to do multiple tests, add a +x at the end of the tag. e.g.
+# `auth-v1.2.3-test+1`.
+#
+# Once the testing is done, also delete the tag(s) please.
+
+on:
+    push:
+        # Run when a tag matching the pattern "auth-v*"" is pushed
+        tags:
+            - "auth-v*"
+
+env:
+    FLUTTER_VERSION: "3.16.9"
+
+jobs:
+    build-ubuntu:
+        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: Setup keys
+              uses: timheuer/base64-to-file@v1
+              with:
+                  fileName: "keystore/ente_auth_key.jks"
+                  encodedString: ${{ secrets.SIGNING_KEY }}
+
+            - name: Create artifacts directory
+              run: mkdir artifacts
+
+            - name: Build independent APK
+              run: |
+                  flutter build apk --release --flavor independent --dart-define=app.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"
+                  SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+
+            - name: Build PlayStore AAB
+              run: |
+                  flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore
+              env:
+                  SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
+                  SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+
+            - name: Install dependencies for desktop build
+              run: |
+                  sudo apt-get update -y
+                  sudo apt-get install -y libsecret-1-dev libsodium-dev libwebkit2gtk-4.0-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm libsqlite3-dev locate
+
+            - 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
+              # Temporarily disable desktop builds
+              if: false
+              run: |
+                  flutter config --enable-linux-desktop
+                  dart pub global activate flutter_distributor
+                  flutter_distributor package --platform=linux --targets=deb --skip-clean
+                  flutter_distributor package --platform=linux --targets=rpm --skip-clean
+                  flutter_distributor package --platform=linux --targets=appimage --skip-clean
+                  mv dist/**/*-*-linux.deb artifacts/ente-${{ github.ref_name }}-x86_64.deb
+                  mv dist/**/*-*-linux.rpm artifacts/ente-${{ github.ref_name }}-x86_64.rpm
+                  mv dist/**/*-*-linux.AppImage artifacts/ente-${{ github.ref_name }}-x86_64.AppImage
+              env:
+                  LIBSODIUM_USE_PKGCONFIG: 1
+
+            - name: Generate checksums
+              run: sha256sum artifacts/ente-* > artifacts/sha256sum
+
+            - name: Create a draft GitHub release
+              uses: ncipollo/release-action@v1
+              with:
+                  artifacts: "auth/artifacts/*"
+                  draft: true
+                  allowUpdates: true
+                  updateOnlyUnreleased: true
+
+            - name: Upload AAB to PlayStore
+              # Temporarily disable GP upload, enable this once desktop build
+              # testing is complete.
+              if: false
+              uses: r0adkll/upload-google-play@v1
+              with:
+                  serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+                  packageName: io.ente.auth
+                  releaseFiles: build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  track: internal
+
+    build-windows:
+        runs-on: windows-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: Build Windows installer
+              # Temporarily disable desktop builds
+              if: false
+              run: |
+                  flutter config --enable-windows-desktop
+                  dart pub global activate flutter_distributor
+                  make innoinstall
+                  flutter_distributor package --platform=windows --targets=exe --skip-clean
+                  mv dist/**/ente_auth-*-windows-setup.exe artifacts/ente-${{ github.ref_name }}-installer.exe
+
+            - name: Retain Windows EXE and DLLs
+              # Temporarily disable desktop builds
+              if: false
+              run: cp -r build/windows/x64/runner/Release ente-${{ github.ref_name }}-windows
+
+            - name: Code sign Windows installer and EXE
+              # Temporarily disable desktop builds
+              if: false
+              uses: dlemstra/code-sign-action@v1
+              with:
+                  certificate: "${{ secrets.WINDOWS_CERTIFICATE }}"
+                  password: "${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}"
+                  files: |
+                      auth/artifacts/ente-${{ github.ref_name }}-installer.exe
+                      auth/ente-${{ github.ref_name }}-windows/auth.exe
+
+            - name: Zip Windows EXE and DLLs
+              # Temporarily disable desktop builds
+              if: false
+              run: tar.exe -a -c -f auth/artifacts/ente-${{ github.ref_name }}-windows.zip auth/ente-${{ github.ref_name }}-windows
+
+            - name: Create a draft GitHub release
+              uses: ncipollo/release-action@v1
+              with:
+                  artifacts: "auth/artifacts/*"
+                  draft: true
+                  allowUpdates: true
+                  updateOnlyUnreleased: true
+
+    build-macos:
+        runs-on: macos-13 # latest is 12
+
+        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: Install code signing dependencies
+              run: |
+                  pip3 install codemagic-cli-tools
+
+            - name: Add provisioning profiles
+              run: |
+                  PROFILES_HOME="$HOME/Library/MobileDevice/Provisioning Profiles"
+                  mkdir -p "$PROFILES_HOME"
+                  PROFILE_PATH="$(mktemp "$PROFILES_HOME"/$(uuidgen).provisionprofile)"
+                  echo ${CM_PROVISIONING_PROFILE} | base64 --decode > "$PROFILE_PATH"
+                  echo "Saved provisioning profile $PROFILE_PATH"
+              env:
+                  CM_PROVISIONING_PROFILE: ${{ secrets.MAC_OS_BUILD_PROVISION_PROFILE_BASE64 }}
+
+            - name: Add certificates
+              run: |
+                  # create variables
+                  CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+
+                  # copy certificates from base64
+                  echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
+
+                  # add certificate to keychain
+                  keychain initialize
+                  keychain add-certificates --certificate $CERTIFICATE_PATH --certificate-password $P12_PASSWORD
+
+                  # Use profile in current project
+                  xcode-project use-profiles --project=macos/**/*.xcodeproj
+              env:
+                  BUILD_CERTIFICATE_BASE64: ${{ secrets.MAC_OS_CERTIFICATE }}
+                  P12_PASSWORD: ${{ secrets.MAC_OS_CERTIFICATE_PASSWORD }}
+
+            - name: Install build dependencies
+              run: |
+                  python3 -m pip install setuptools
+                  npm install -g appdmg
+
+            - name: Create artifacts directory
+              run: mkdir artifacts
+
+            - name: Build macOS DMG
+              # Temporarily disable desktop builds
+              if: false
+              run: |
+                  flutter config --enable-macos-desktop
+                  dart pub global activate flutter_distributor
+                  flutter_distributor package --platform=macos --targets=dmg --skip-clean
+                  mv dist/**/ente_auth-*-macos.dmg artifacts/ente-${{ github.ref_name }}.dmg
+
+            - name: Code sign DMG
+              # Temporarily disable desktop builds
+              if: false
+              run: |
+                  CERT_NAME=$(security find-identity -v -p codesigning | grep "Developer ID Application" | awk -F'"' '{print $2}' | grep -m1 "")
+                  codesign --force --timestamp --sign "$CERT_NAME" --options runtime artifacts/ente-${{ github.ref_name }}.dmg
+                  codesign --verify --verbose=4 artifacts/ente-${{ github.ref_name }}.dmg
+
+            - name: Notarize and staple DMG
+              # Temporarily disable desktop builds
+              if: false
+              run: |
+                  xcrun notarytool submit artifacts/ente-${{ github.ref_name }}.dmg \
+                    --wait \
+                    --apple-id $APPLE_ID \
+                    --password $APPLE_PASSWORD \
+                    --team-id $APPLE_TEAM_ID
+                  xcrun stapler staple artifacts/ente-${{ github.ref_name }}.dmg
+              env:
+                  APPLE_ID: ${{ secrets.APPLE_ID }}
+                  APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+                  APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+
+            - name: Create a draft GitHub release
+              uses: ncipollo/release-action@v1
+              with:
+                  artifacts: "auth/artifacts/*"
+                  draft: true
+                  allowUpdates: true
+                  updateOnlyUnreleased: true
--- a/.github/workflows/cli-release.yml
+++ b/.github/workflows/cli-release.yml
@ -0,0 +1,51 @@
+name: "Release (cli)"
+
+on:
+    push:
+        # Run when a tag matching the pattern "cli-v*"" is pushed
+        #
+        # Tip: to test this workflow, push at tag with a pre-release version,
+        # e.g. `cli-v1.2.3-test`, where 1.2.3 is the expected version number of
+        # the next release that'll go out.
+        #
+        # See: [Note: Testing release workflows that are triggered by tags]
+        tags:
+            - "cli-v*"
+
+jobs:
+    draft-release:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Create a draft GitHub release
+              uses: ncipollo/release-action@v1
+              with:
+                  draft: true
+
+    build:
+        runs-on: ubuntu-latest
+        needs: draft-release
+
+        strategy:
+            matrix:
+                goos: [linux, windows, darwin]
+                goarch: ["386", amd64, arm64]
+                exclude:
+                    - goarch: "386"
+                      goos: darwin
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Build binaries and add to the release
+              uses: wangyoucao577/go-release-action@v1
+              with:
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
+                  goos: ${{ matrix.goos }}
+                  goarch: ${{ matrix.goarch }}
+                  asset_name: ente-${{ github.ref_name }}-${{ matrix.goos }}-${{ matrix.goarch }}
+                  release_name: ${{ github.ref_name }}
+                  goversion: "1.20"
+                  project_path: "./cli"
+                  md5sum: false
+                  sha256sum: true
--- a/.github/workflows/mobile-crowdin.yml
+++ b/.github/workflows/mobile-crowdin.yml
@ -0,0 +1,41 @@
+name: "Sync Crowdin translations (mobile)"
+
+on:
+    push:
+        paths:
+            # Run action when mobiles's intl_en.arb is changed
+            - "mobile/lib/l10n/intl_en.arb"
+            # Or the workflow itself is changed
+            - ".github/workflows/mobile-crowdin.yml"
+        branches: [main]
+    schedule:
+        # Run every 24 hours - https://crontab.guru/#0_*/24_*_*_*
+        - cron: "0 */24 * * *"
+    workflow_dispatch: # Allow manually running the action
+
+jobs:
+    synchronize-with-crowdin:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Crowdin's action
+              uses: crowdin/github-action@v1
+              with:
+                  base_path: "mobile/"
+                  config: "mobile/crowdin.yml"
+                  upload_sources: true
+                  upload_translations: true
+                  download_translations: true
+                  localization_branch_name: crowdin-translations-mobile
+                  create_pull_request: true
+                  skip_untranslated_strings: true
+                  pull_request_title: "[mobile] New translations"
+                  pull_request_body: "New translations from [Crowdin](https://crowdin.com/project/ente-photos-app)"
+                  pull_request_base_branch_name: "main"
+                  project_id: 574741
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/.github/workflows/mobile-lint.yml
+++ b/.github/workflows/mobile-lint.yml
@ -0,0 +1,37 @@
+name: "Lint (mobile)"
+
+on:
+    # Run on every push (this also covers pull requests)
+    push:
+        # See: [Note: Specify branch when specifying a path filter]
+        branches: ["**"]
+        # Only run if something changes in these paths
+        paths:
+            - "mobile/**"
+            - ".github/workflows/mobile-lint.yml"
+
+env:
+    FLUTTER_VERSION: "3.13.4"
+
+jobs:
+    lint:
+        runs-on: ubuntu-latest
+        defaults:
+            run:
+                working-directory: mobile
+        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
+
+            - run: flutter pub get
+
+            - run: flutter analyze --no-fatal-infos
--- a/.github/workflows/mobile-release.yml
+++ b/.github/workflows/mobile-release.yml
@ -0,0 +1,56 @@
+name: "Release (photos independent)"
+
+on:
+    workflow_dispatch: # Allow manually running the action
+    push:
+        # Run when a tag matching the pattern "photos-v*"" is pushed
+        # See: [Note: Testing release workflows that are triggered by tags]
+        tags:
+            - "photos-v*"
+
+env:
+    FLUTTER_VERSION: "3.13.4"
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        defaults:
+            run:
+                working-directory: mobile
+
+        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: Setup keys
+              uses: timheuer/base64-to-file@v1
+              with:
+                  fileName: "keystore/ente_photos_key.jks"
+                  encodedString: ${{ secrets.SIGNING_KEY_PHOTOS }}
+
+            - name: Build independent APK
+              run: flutter build apk --release --flavor independent && mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente.apk
+              env:
+                  SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"
+                  SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
+                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD_PHOTOS }}
+                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD_PHOTOS }}
+
+            - name: Checksum
+              run: sha256sum build/app/outputs/flutter-apk/ente.apk > build/app/outputs/flutter-apk/sha256sum
+
+            - name: Create a draft GitHub release
+              uses: ncipollo/release-action@v1
+              with:
+                  artifacts: "mobile/build/app/outputs/flutter-apk/ente.apk,mobile/build/app/outputs/flutter-apk/sha256sum"
+                  draft: true
--- a/.github/workflows/server-lint.yml
+++ b/.github/workflows/server-lint.yml
@ -0,0 +1,33 @@
+name: "Lint (server)"
+
+on:
+    # Run on every push (this also covers pull requests)
+    push:
+        # See: [Note: Specify branch when specifying a path filter]
+        branches: ["**"]
+        # Only run if something changes in these paths
+        paths:
+            - "server/**"
+            - ".github/workflows/server-lint.yml"
+
+jobs:
+    lint:
+        runs-on: ubuntu-latest
+        defaults:
+            run:
+                working-directory: server
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup go
+              uses: actions/setup-go@v5
+              with:
+                  go-version-file: "server/go.mod"
+                  cache: true
+
+            - name: Install dependencies
+              run: sudo apt-get update && sudo apt-get install libsodium-dev
+
+            - name: Lint
+              run: "./scripts/lint.sh"
--- a/.github/workflows/server-release.yml
+++ b/.github/workflows/server-release.yml
@ -1,16 +1,10 @@
-name: Prod CI
+name: "Release (server)"

 on:
-    workflow_dispatch:
-    # Enable manual run
-    push:
-        # Sequence of patterns matched against refs/tags
-        tags:
-            - "v*" # Push events to matching v*, i.e. v4.2.0
+    workflow_dispatch: # Run manually

 jobs:
    build:
-        # This job will run on ubuntu virtual machine
        runs-on: ubuntu-latest
        steps:
            - uses: actions/checkout@v4
@ -19,6 +13,8 @@ jobs:
            - uses: mr-smithers-excellent/docker-build-push@v6
              name: Build & Push
              with:
+                  dockerfile: server/Dockerfile
+                  directory: server
                  image: ente/museum-prod
                  registry: rg.fr-par.scw.cloud
                  enableBuildKit: true
--- a/.github/workflows/web-crowdin.yml
+++ b/.github/workflows/web-crowdin.yml
@ -0,0 +1,41 @@
+name: "Sync Crowdin translations (web)"
+
+on:
+    push:
+        paths:
+            # Run action when web's en-US/translation.json is changed
+            - "web/apps/photos/public/locales/en-US/translation.json"
+            # Or the workflow itself is changed
+            - ".github/workflows/web-crowdin.yml"
+        branches: [main]
+    schedule:
+        # Run every 24 hours - https://crontab.guru/#0_*/24_*_*_*
+        - cron: "0 */24 * * *"
+    workflow_dispatch: # Allow manually running the action
+
+jobs:
+    synchronize-with-crowdin:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Crowdin's action
+              uses: crowdin/github-action@v1
+              with:
+                  base_path: "web/"
+                  config: "web/crowdin.yml"
+                  upload_sources: true
+                  upload_translations: true
+                  download_translations: true
+                  localization_branch_name: crowdin-translations-web
+                  create_pull_request: true
+                  skip_untranslated_strings: true
+                  pull_request_title: "[web] New translations"
+                  pull_request_body: "New translations from [Crowdin](https://crowdin.com/project/ente-photos-web)"
+                  pull_request_base_branch_name: "main"
+                  project_id: 569613
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/.github/workflows/web-lint.yml
+++ b/.github/workflows/web-lint.yml
@ -0,0 +1,41 @@
+name: "Lint (web)"
+
+on:
+    # Run on every push (this also covers pull requests)
+    push:
+        # [Note: Specify branch when specifying a path filter]
+        #
+        # Path filters are ignored for tag pushes, which causes this workflow to
+        # always run when we push a tag. Defining an explicit branch solves the
+        # issue. From GitHub's docs:
+        #
+        # > if you define both branches/branches-ignore and paths/paths-ignore,
+        # > the workflow will only run when both filters are satisfied.
+        #
+        # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+        branches: ["**"]
+        # Only run if something changes in these paths
+        paths:
+            - "web/**"
+            - ".github/workflows/web-lint.yml"
+
+jobs:
+    lint:
+        runs-on: ubuntu-latest
+        defaults:
+            run:
+                working-directory: web
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup node and enable yarn caching
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: "yarn"
+                  cache-dependency-path: "web/yarn.lock"
+
+            - run: yarn install
+
+            - run: yarn lint
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -42,7 +42,7 @@ projects to get started:


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

@ -63,8 +63,9 @@ If you'd like to contribute code, it is best to start small.

 Each of the individual product/platform specific directories in this repository
 have instructions on setting up a dev environment and making changes. The issues
-labelled "good first issues" should be good starting points. Once you have a
-bearing, you can head on to issues labelled "help wanted".
+and discussions (feature requests) labelled "good first issues" should be good
+starting points. Once you have a bearing, you can head on to issues or
+discussions labelled "help wanted".

 If you're planning on adding a new feature or making any other substantial
 change, please [discuss it with
--- a/README.md
+++ b/README.md
@ -70,6 +70,7 @@ existing users will be grandfathered in.
 [<img height="42" src=".github/assets/app-store-badge.svg">](https://apps.apple.com/app/id6444121398)
 [<img height="42" src=".github/assets/play-store-badge.png">](https://play.google.com/store/apps/details?id=io.ente.auth)
 [<img height="42" src=".github/assets/f-droid-badge.png">](https://f-droid.org/packages/io.ente.auth/)
+[<img height="42" src=".github/assets/github-badge.png">](https://github.com/ente-io/ente/releases?q=tag%3Av2.0.34&expanded=true)
 [<img height="42" src=".github/assets/web-badge.svg">](https://auth.ente.io)

 </div>
@ -98,6 +99,8 @@ connect with the 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)

+[![Twitter](.github/assets/twitter.svg)](https://twitter.com/enteio) &nbsp; [![Mastodon](.github/assets/mastodon.svg)](https://mstdn.social/@ente)
+
 ---

 ## Security
--- a/auth/.github/workflows/ci.yml
+++ b/auth/.github/workflows/ci.yml
@ -1,86 +0,0 @@
-name: release
-
-# This workflow is triggered on pushes to the repository.
-on:
-    workflow_dispatch:
-        # Enable manual run
-    push:
-        # Sequence of patterns matched against refs/tags
-        tags:
-            - "v*" # Push events to matching v*, i.e. v4.2.0
-
-jobs:
-    build:
-        # This job will run on ubuntu virtual machine
-        runs-on: ubuntu-latest
-        steps:
-            # Setup Java environment in order to build the Android app.
-            - uses: actions/checkout@v2
-            - uses: actions/setup-java@v2
-              with:
-                  distribution: "adopt"
-                  java-version: "11"
-
-            # Setup the flutter environment.
-            - uses: subosito/flutter-action@v2
-              with:
-                  channel: "stable"
-                  flutter-version: "3.13.4"
-
-            # Fetch sub modules
-            - run: git submodule update --init --recursive
-
-            # Get flutter dependencies.
-            - run: flutter pub get
-
-            - name: Setup keys
-              uses: timheuer/base64-to-file@v1
-              with:
-                  fileName: "keystore/ente_auth_key.jks"
-                  encodedString: ${{ secrets.SIGNING_KEY }}
-
-            # Build independent apk.
-            - name: Build
-              run: flutter build apk --release --flavor independent --dart-define=app.flavor=independent && mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-auth.apk
-              env:
-                  SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
-                  SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-
-            # Build Play store aab.
-            - name: Build
-              run: flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore
-              env:
-                  SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
-                  SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-
-            - name: Checksum
-              run: sha256sum build/app/outputs/flutter-apk/ente-auth.apk > build/app/outputs/flutter-apk/sha256sum
-
-            # Upload generated apk to the artifacts.
-            - uses: actions/upload-artifact@v2
-              with:
-                  name: release-apk
-                  path: build/app/outputs/flutter-apk/ente-auth.apk
-
-            - uses: actions/upload-artifact@v2
-              with:
-                  name: release-checksum
-                  path: build/app/outputs/flutter-apk/sha256sum
-
-            # Create a Github release
-            - uses: ncipollo/release-action@v1
-              with:
-                  artifacts: "build/app/outputs/flutter-apk/ente-auth.apk,build/app/outputs/flutter-apk/sha256sum"
-                  token: ${{ secrets.GITHUB_TOKEN }}
-
-            # Upload to Play store
-            - uses: ente-io/upload-google-play@v1
-              with:
-                  serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-                  packageName: io.ente.auth
-                  releaseFiles: build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
-                  track: internal
--- a/auth/.github/workflows/desktop.yml
+++ b/auth/.github/workflows/desktop.yml
@ -1,12 +0,0 @@
-name: desktop build
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-linux:
-    name: Linux
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2
--- a/auth/.github/workflows/l18n-crowdin.yml
+++ b/auth/.github/workflows/l18n-crowdin.yml
@ -1,35 +0,0 @@
-name: Sync crowdin translation
-
-on:
-  push:
-    paths: # run action automatically when app_en.arb file is changed
-      - 'lib/l10n/arb/app_en.arb'
-    branches: [ main ]
-  schedule:
-    - cron: '0 */12 * * *' # Every 12 hours - https://crontab.guru/#0_*/12_*_*_*
-  workflow_dispatch: # for manually running the action
-
-jobs:
-  synchronize-with-crowdin:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: crowdin action
-        uses: crowdin/github-action@v1
-        with:
-          upload_sources: true
-          upload_translations: true
-          download_translations: true
-          localization_branch_name: l10n_translations
-          create_pull_request: true
-          skip_untranslated_strings: true
-          pull_request_title: 'New Translations'
-          pull_request_body: 'New translations via [Crowdin GH Action](https://github.com/crowdin/github-action)'
-          pull_request_base_branch_name: 'main'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/auth/android/app/build.gradle
+++ b/auth/android/app/build.gradle
@ -56,11 +56,11 @@ android {

    signingConfigs {
       release {
-           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : file(System.getenv("SIGNING_KEY_PATH"))
-           keyAlias keystoreProperties['keyAlias'] ? keystoreProperties['keyAlias'] : System.getenv("SIGNING_KEY_ALIAS")
-           keyPassword keystoreProperties['keyPassword'] ? keystoreProperties['keyPassword'] : System.getenv("SIGNING_KEY_PASSWORD")
-           storePassword keystoreProperties['storePassword'] ? keystoreProperties['storePassword'] : System.getenv("SIGNING_STORE_PASSWORD")
-       }
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : System.getenv("SIGNING_KEY_PATH") ? file(System.getenv("SIGNING_KEY_PATH")) : null
+            keyAlias keystoreProperties['keyAlias'] ? keystoreProperties['keyAlias'] : System.getenv("SIGNING_KEY_ALIAS")
+            keyPassword keystoreProperties['keyPassword'] ? keystoreProperties['keyPassword'] : System.getenv("SIGNING_KEY_PASSWORD")
+            storePassword keystoreProperties['storePassword'] ? keystoreProperties['storePassword'] : System.getenv("SIGNING_STORE_PASSWORD")
+        }
    }
    
    flavorDimensions "default"
--- a/auth/android/app/src/main/AndroidManifest.xml
+++ b/auth/android/app/src/main/AndroidManifest.xml
@ -35,6 +35,13 @@
                <data android:scheme="otpauth" />
            </intent-filter>

+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="enteauth" />
+            </intent-filter>
+
        </activity>

        <!-- Don't delete the meta-data below.
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@ -30,6 +30,10 @@
    {
      "title": "Bitwarden"
    },
+    {
+      "title": "Bloom Host",
+      "slug": "bloom_host"
+    },
    {
      "title": "BorgBase",
      "altNames": ["borg"],
@ -110,7 +114,7 @@
    },
    {
      "title": "Healthchecks.io",
-      "slug": "healthchecks",
+      "slug": "healthchecks"
    },
    {
      "title": "ING"
@ -298,7 +302,7 @@
    },
    {
      "title": "Synology DSM",
-      "slug": "synology_dsm",
+      "slug": "synology_dsm"
    },
    {
      "title": "TCPShield",
--- a/auth/assets/custom-icons/icons/bloom_host.svg
+++ b/auth/assets/custom-icons/icons/bloom_host.svg
--- a/auth/coverage_badge.svg
+++ b/auth/coverage_badge.svg
@ -1,20 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="102" height="20">
-    <linearGradient id="b" x2="0" y2="100%">
-        <stop offset="0" stop-color="#bbb" stop-opacity=".1" />
-        <stop offset="1" stop-opacity=".1" />
-    </linearGradient>
-    <clipPath id="a">
-        <rect width="102" height="20" rx="3" fill="#fff" />
-    </clipPath>
-    <g clip-path="url(#a)">
-        <path fill="#555" d="M0 0h59v20H0z" />
-        <path fill="#44cc11" d="M59 0h43v20H59z" />
-        <path fill="url(#b)" d="M0 0h102v20H0z" />
-    </g>
-    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110">
-        <text x="305" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="490">coverage</text>
-        <text x="305" y="140" transform="scale(.1)" textLength="490">coverage</text>
-        <text x="795" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="330">100%</text>
-        <text x="795" y="140" transform="scale(.1)" textLength="330">100%</text>
-    </g>
-</svg>
--- a/auth/crowdin.yml
+++ b/auth/crowdin.yml
@ -1,6 +1,5 @@
-project_id_env: CROWDIN_PROJECT_ID
 api_token_env: CROWDIN_PERSONAL_TOKEN

 files:
  - source: /lib/l10n/arb/app_en.arb
-    translation: /lib/l10n/arb/app_%two_letters_code%.arb
+    translation: /lib/l10n/arb/app_%two_letters_code%.arb
--- a/auth/docs/README.md
+++ b/auth/docs/README.md
@ -1,3 +1,12 @@
 ## Developer docs

 Documentation and notes about more advanced or infrequently needed details.
+
+### Running
+
+If you're using VSCode, you can setup the launch configuration by copying the
+template into your `.vscode` folder at the root of the project.
+
+```bash
+cp auth/docs/vscode/launch.json .vscode/
+```
--- a/auth/docs/localization.md
+++ b/auth/docs/localization.md
@ -4,7 +4,7 @@ If the feature requires adding new strings, you can do that by following these
 steps:

 1. Add a new entry inside
-   [app_en.arb](https://github.com/ente-io/auth/blob/main/lib/l10n/arb/app_en.arb)
+   [app_en.arb](https://github.com/ente-io/ente/blob/main/auth/lib/l10n/arb/app_en.arb)
   (remember to save!)

 2.  In your dart file, add the following import
--- a/auth/docs/release.md
+++ b/auth/docs/release.md
@ -1,12 +1,22 @@
 # Releases

-1. Create a PR to bump up the version number in `pubspec.yaml`.
+Create a PR to bump up the version in `pubspec.yaml`. Once that is merged, tag
+main, and push the tag.

-2. Once that is merged, tag main. This'll trigger the
-   [workflow](.github/workflows/ci.yml) to (a) create a new GitHub release with
-   the independently distributed APK, and (b) build and upload a release to
-   Google Play.
+```sh
+git tag auth-v1.2.3
+git push origin auth-v1.2.3
+```

-3. Xcode Cloud has already been configured and will automatically build and
-   release to TestFlight when step 1 was merged to main (you can see logs under
-   the PR checks).
+This'll trigger a GitHub workflow that:
+
+* Creates a new draft GitHub release and attaches all the build artifacts to it
+  (mobile APKs and various desktop packages),
+
+* Creates a new release in the internal track on Play Store.
+
+Once the workflow completes, go to the draft GitHub release that was created.
+Set "Previous tag" to the last release of auth and press "Generate release
+notes". The generated release note will contain all PRs and new contributors
+from all the releases in the monorepo, so you'll need to filter them to keep
+only the things that relate to the auth.
--- a/auth/docs/vscode/launch.json
+++ b/auth/docs/vscode/launch.json
@ -6,14 +6,14 @@
            "request": "launch",
            "type": "dart",
            "flutterMode": "debug",
-            "program": "lib/main.dart",
+            "program": "auth/lib/main.dart",
            "args": ["--dart-define", "endpoint=http://localhost:8080"]
        },
        {
            "name": "Auth Android Dev",
            "request": "launch",
            "type": "dart",
-            "program": "lib/main.dart",
+            "program": "auth/lib/main.dart",
            "args": [
                "--dart-define",
                "endpoint=http://192.168.1.3:8080",
@ -25,21 +25,21 @@
            "name": "Auth iOS Dev",
            "request": "launch",
            "type": "dart",
-            "program": "lib/main.dart",
+            "program": "auth/lib/main.dart",
            "args": ["--dart-define", "endpoint=http://192.168.1.30:8080"]
        },
        {
            "name": "Auth iOS Prod",
            "request": "launch",
            "type": "dart",
-            "program": "lib/main.dart",
+            "program": "auth/lib/main.dart",
            "args": ["--target", "lib/main.dart"]
        },
        {
            "name": "Auth Android Prod",
            "request": "launch",
            "type": "dart",
-            "program": "lib/main.dart",
+            "program": "auth/lib/main.dart",
            "args": ["--target", "lib/main.dart", "--flavor", "independent"]
        }
    ]
--- a/auth/ios/Runner/Info.plist
+++ b/auth/ios/Runner/Info.plist
@ -37,6 +37,7 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>otpauth</string>
+				<string>enteauth</string>
 			</array>
 		</dict>
 	</array>
--- a/auth/lib/core/constants.dart
+++ b/auth/lib/core/constants.dart
@ -7,7 +7,7 @@ const String sentryDSN =
    "https://ed4ddd6309b847ba8849935e26e9b648@sentry.ente.io/9";
 const String sentryTunnel = "https://sentry-reporter.ente.io";
 const String roadmapURL = "https://roadmap.ente.io";
-const String githubIssuesUrl = "https://github.com/ente-io/auth/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc";
+const String githubDiscussionsUrl = "https://github.com/ente-io/ente/discussions";
 const int microSecondsInDay = 86400000000;
 const int android11SDKINT = 30;
 const int galleryLoadStartTime = -8000000000000000; // Wednesday, March 6, 1748
--- a/auth/lib/core/network.dart
+++ b/auth/lib/core/network.dart
@ -76,8 +76,8 @@ class EnteRequestInterceptor extends Interceptor {
  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
    if (kDebugMode) {
      assert(
-      options.baseUrl == enteEndpoint,
-      "interceptor should only be used for API endpoint",
+        options.baseUrl == enteEndpoint,
+        "interceptor should only be used for API endpoint",
      );
    }
    // ignore: prefer_const_constructors
--- a/auth/lib/l10n/arb/app_ar.arb
+++ b/auth/lib/l10n/arb/app_ar.arb
@ -1 +1,408 @@
-{}
+{
+  "account": "حسابي",
+  "unlock": "فتح القفل",
+  "recoveryKey": "مفتاح الاسترداد",
+  "counterAppBarTitle": "العداد",
+  "@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": "المصدِّر",
+  "codeSecretKeyHint": "الرمز السري",
+  "codeAccountHint": "الحساب (you@domain.com)",
+  "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": "هل أنت متأكد من أنك تريد حذف هذا الرمز ؟ هذا الإجراء لا رجعة فيه.",
+  "viewLogsAction": "عرض السجل",
+  "sendLogsDescription": "هذا سوف يرسل عبر السجلات لمساعدتنا على تصحيح مشكلتك. وبينما نتخذ الاحتياطات لضمان عدم تسجيل المعلومات الحساسة، نشجعك على رؤية هذه السجلات قبل تقاسمها.",
+  "preparingLogsTitle": "جاري إعداد السجلات...",
+  "emailLogsTitle": "سجلات البريد الإلكتروني",
+  "emailLogsMessage": "الرجاء إرسال السجلات إلى {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "نسخ البريد الإلكتروني",
+  "exportLogsAction": "تصدير السجلات",
+  "reportABug": "الابلاغ عن خلل تقني",
+  "crashAndErrorReporting": "الإبلاغ عن الأعطال والأخطاء",
+  "reportBug": "الإبلاغ عن خلل",
+  "emailUsMessage": "الرجاء مراسلتنا على {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "الاتصال بالدعم",
+  "rateUsOnStore": "قم بتقييمنا على {storeName}",
+  "blog": "المدونة",
+  "merchandise": "إدارة المنتجات",
+  "verifyPassword": "التحقق من كلمة المرور",
+  "pleaseWait": "الرجاء الإنتظار...",
+  "generatingEncryptionKeysTitle": "توليد مفاتيح التشفير...",
+  "recreatePassword": "إعادة كتابة كلمة المرور",
+  "recreatePasswordMessage": "الجهاز الحالي ليس قويًا بما يكفي للتحقق من كلمة المرور الخاصة بك، لذا نحتاج إلى إعادة إنشائها مرة واحدة بطريقة تعمل مع جميع الأجهزة.\n\nالرجاء تسجيل الدخول باستخدام مفتاح الاسترداد وإعادة إنشاء كلمة المرور الخاصة بك (يمكنك استخدام نفس كلمة المرور مرة أخرى إذا كنت ترغب في ذلك).",
+  "useRecoveryKey": "استخدم مفتاح الاسترداد",
+  "incorrectPasswordTitle": "كلمة المرور غير صحيحة",
+  "welcomeBack": "مرحبًا مجددًا!",
+  "madeWithLoveAtPrefix": "مصنوعة مع ❤️ في ",
+  "supportDevs": "اشترك في <bold-green>ente</bold-green> لدعمنا",
+  "supportDiscount": "استخدم رمز القسيمة \"AUTH\" للحصول على 10% خصم من السنة الأولى",
+  "changeEmail": "تغيير البريد الإلكتروني",
+  "changePassword": "تغيير كلمة المرور",
+  "data": "البيانات",
+  "importCodes": "رمزالاستيراد",
+  "importTypePlainText": "نص عادي",
+  "importTypeEnteEncrypted": "تصدير مشفر ente",
+  "passwordForDecryptingExport": "كلمة المرور لفك تشفير التصدير",
+  "passwordEmptyError": "لا يمكن أن تكون كلمة المرور فارغة",
+  "importFromApp": "استيراد الرموز من {appName}",
+  "importGoogleAuthGuide": "قم بتصدير حساباتك من Google Authenticator إلى رمز QR code باستخدام خيار \"Transfer Accounts\" ثم استخدم جهازًا آخر لمسح رمز الاستجابة السريعة ضوئيًا.\n\nنصيحة: يمكنك استخدام كاميرا الويب الخاصة بالكمبيوتر المحمول لالتقاط صورة لرمز الاستجابة السريعة.",
+  "importSelectJsonFile": "حدد ملف JSON",
+  "importSelectAppExport": "حدد ملف التصدير {appName}",
+  "importEnteEncGuide": "حدد ملف JSON المشفر الذي تم تصديره من ente",
+  "importRaivoGuide": "استخدم خيار تصدير OTP إلى أرشيف Zip في إعدادات Raivo.\n\nاستخرج ملف zip واسترد ملف JSON.",
+  "importBitwardenGuide": "استخدم خيار \"تصدير خزانة\" داخل أدوات Bitwarden واستيراد ملف JSON غير مشفر.",
+  "importAegisGuide": "استخدم خيار \"Export the vault\" في إعدادات Aegis.\n\nإذا كان المخزن الخاص بك مشفرًا، فستحتاج إلى إدخال كلمة مرور المخزن لفك تشفير المخزن.",
+  "import2FasGuide": "استخدم خيار \"الإعدادات -> النسخ الاحتياطي - التصدير\" في 2FAS.\n\nإذا تم تشفير النسخة الاحتياطية، سوف تحتاج إلى إدخال كلمة المرور لفك تشفير النسخة الاحتياطية",
+  "importLastpassGuide": "استخدم خيار \"حسابات النقل\" ضمن إعدادات مصادقة Lastpass، واضغط على \"تصدير الحسابات إلى الملف\". استيراد JSON الذي تم تنزيله.",
+  "exportCodes": "تصدير الرموز",
+  "importLabel": "استيراد",
+  "importInstruction": "الرجاء تحديد ملف يحتوي على قائمة بالرموز الخاصة بك بالشكل التالي",
+  "importCodeDelimiterInfo": "يمكن فصل الرموز بفاصلة أو سطر جديد",
+  "selectFile": "اختيار الملف",
+  "emailVerificationToggle": "تأكيد عنوان البريد الإلكتروني",
+  "emailVerificationEnableWarning": "لتجنب إقفال حسابك، تأكد من تخزين نسخة من بريدك الإلكتروني 2FA خارج Ente Auth قبل تمكين التحقق من البريد الإلكتروني.",
+  "authToChangeEmailVerificationSetting": "الرجاء المصادقة لتغيير التحقق من البريد الإلكتروني",
+  "authToViewYourRecoveryKey": "الرجاء المصادقة لعرض مفتاح الاسترداد الخاص بك",
+  "authToChangeYourEmail": "الرجاء المصادقة لتغيير بريدك الإلكتروني",
+  "authToChangeYourPassword": "الرجاء المصادقة لتغيير كلمة المرور الخاصة بك",
+  "authToViewSecrets": "الرجاء المصادقة لعرض مفتاح الاسترداد الخاص بك",
+  "authToInitiateSignIn": "الرجاء المصادقة لبدء تسجيل الدخول للنسخ الاحتياطي.",
+  "ok": "حسناً",
+  "cancel": "إلغاء",
+  "yes": "نعم",
+  "no": "لا",
+  "email": "البريد الإلكتروني",
+  "support": "الدعم",
+  "general": "العامة",
+  "settings": "الإعدادات",
+  "copied": "تم النسخ",
+  "pleaseTryAgain": "حاول مرة اخرى",
+  "existingUser": "المستخدم موجود",
+  "newUser": "جديد إلى Ente",
+  "delete": "حذف",
+  "enterYourPasswordHint": "أدخل كلمة المرور الخاصة بك",
+  "forgotPassword": "هل نسيت كلمة المرور",
+  "oops": "عذرًا",
+  "suggestFeatures": "اقتراح ميزة",
+  "faq": "الأسئلة الأكثر شيوعاً",
+  "faq_q_1": "ما مدى أمان المصادقة؟",
+  "faq_a_1": "يتم تشفير جميع الرموز التي تقوم بنسخها احتياطا عبر Ente. وهذا يعني أنه يمكنك فقط الوصول إلى الرموز الخاصة بك. تطبيقاتنا مفتوحة المصدر وقد تم مراجعة التشفير خارجيا.",
+  "faq_q_2": "هل يمكنني الوصول إلى رموزي على سطح المكتب؟",
+  "faq_a_2": "يمكنك الوصول إلى رموزك على الويب @ auth.ente.io.",
+  "faq_q_3": "كيف يمكنني حذف الرموز؟",
+  "faq_a_3": "يمكنك حذف الرمز عن طريق السحب لليسار على هذا العنصر.",
+  "faq_q_4": "كيف يمكنني دعم هذا المشروع؟",
+  "faq_a_4": "يمكنك دعم تطوير هذا المشروع عن طريق الاشتراك في تطبيق الصور @ ente.io.",
+  "faq_q_5": "كيف يمكنني تمكين قفل FaceID في المصادقة Ente",
+  "faq_a_5": "يمكنك تمكين قفل FaceID تحت الإعدادات => الحماية => قفل الشاشة.",
+  "somethingWentWrongMessage": "حدث خطأ ما، يرجى المحاولة مرة أخرى",
+  "leaveFamily": "مغادرة خطة العائلة",
+  "leaveFamilyMessage": "هل أنت متأكد من الخروج من خطة العائلة؟",
+  "inFamilyPlanMessage": "أنت مندرج ضمن خطة عائلية!",
+  "swipeHint": "اسحب لليسار لتحرير أو إزالة الرموز",
+  "scan": "مسح",
+  "scanACode": "فحص رمز Qr",
+  "verify": "التحقق",
+  "verifyEmail": "تأكيد البريد الإلكتروني",
+  "enterCodeHint": "أدخل الرمز المكون من 6 أرقام من\nتطبيق المصادقة",
+  "lostDeviceTitle": "جهاز مفقود ؟",
+  "twoFactorAuthTitle": "المصادقة الثنائية",
+  "recoverAccount": "إسترجاع الحساب",
+  "enterRecoveryKeyHint": "أدخل رمز الاسترداد",
+  "recover": "استرداد",
+  "contactSupportViaEmailMessage": "الرجاء إسقاط بريد إلكتروني إلى {email} من عنوان بريدك الإلكتروني المسجل",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "لا يوجد مفتاح استرجاع؟",
+  "enterEmailHint": "أدخل عنوان البريد الإلكتروني الخاص بك",
+  "invalidEmailTitle": "عنوان البريد الإلكتروني غير صالح",
+  "invalidEmailMessage": "الرجاء إدخال بريد إلكتروني صالح.",
+  "deleteAccount": "إزالة الحساب",
+  "deleteAccountQuery": "سوف نأسف لرؤيتك تذهب. هل تواجه بعض المشاكل؟",
+  "yesSendFeedbackAction": "نعم، ارسل الملاحظات",
+  "noDeleteAccountAction": "لا، حذف الحساب",
+  "initiateAccountDeleteTitle": "الرجاء المصادقة لبدء حذف الحساب",
+  "sendEmail": "ارسل بريد الكتروني",
+  "createNewAccount": "إنشاء حساب جديد",
+  "weakStrength": "ضعيف",
+  "strongStrength": "قوي",
+  "moderateStrength": "متوسط",
+  "confirmPassword": "تأكيد كلمة المرور",
+  "close": "إغلاق",
+  "oopsSomethingWentWrong": "المعذرة! حدث خطأ ما.",
+  "selectLanguage": "اختر اللغة",
+  "language": "اللغة",
+  "social": "وسائل التواصل",
+  "security": "الأمان",
+  "lockscreen": "شاشة القفل",
+  "authToChangeLockscreenSetting": "الرجاء المصادقة لتغيير إعدادات شاشة القفل",
+  "lockScreenEnablePreSteps": "لتمكين شاشة القفل، الرجاء إعداد رمز مرور الجهاز أو قفل الشاشة في إعدادات النظام الخاص بك.",
+  "viewActiveSessions": "عرض الجلسات النشطة",
+  "authToViewYourActiveSessions": "الرجاء المصادقة لعرض جلساتك النشطة",
+  "searchHint": "بحث...",
+  "search": "بحث",
+  "sorryUnableToGenCode": "عذراً، غير قادر على إنشاء رمز ل {issuerName}",
+  "noResult": "لا توجد نتيجة",
+  "addCode": "أضف رمز",
+  "scanAQrCode": "مسح رمز QR",
+  "enterDetailsManually": "أدخل التفاصيل يدوياً",
+  "edit": "تعديل",
+  "copiedToClipboard": "تم النسخ إلى الحافظة",
+  "copiedNextToClipboard": "تم نسخ الرموز التالية إلى الحافظة",
+  "error": "خطأ",
+  "recoveryKeyCopiedToClipboard": "تم نسخ عبارة الاسترداد للحافظة",
+  "recoveryKeyOnForgotPassword": "إذا نسيت كلمة المرور الخاصة بك، فالطريقة الوحيدة التي يمكنك بها استرداد بياناتك هي بهذا المفتاح.",
+  "recoveryKeySaveDescription": "نحن لا نخزن هذا المفتاح، يرجى حفظ مفتاح الـ 24 كلمة هذا في مكان آمن.",
+  "doThisLater": "قم بهذا لاحقاً",
+  "saveKey": "حفظ المفتاح",
+  "back": "الرجوع",
+  "createAccount": "إنشاء حساب",
+  "passwordStrength": "قوة كلمة المرور: {passwordStrengthValue}",
+  "@passwordStrength": {
+    "description": "Text to indicate the password strength",
+    "placeholders": {
+      "passwordStrengthValue": {
+        "description": "The strength of the password as a string",
+        "type": "String",
+        "example": "Weak or Moderate or Strong"
+      }
+    },
+    "message": "Password Strength: {passwordStrengthText}"
+  },
+  "password": "كلمة المرور",
+  "signUpTerms": "أوافق على <u-terms>شروط الخدمة</u-terms> و<u-policy>سياسة الخصوصية</u-policy>",
+  "privacyPolicyTitle": "سياسة الخصوصية",
+  "termsOfServicesTitle": "الشروط",
+  "encryption": "التشفير",
+  "setPasswordTitle": "تعيين كلمة المرور",
+  "changePasswordTitle": "تغيير كلمة المرور",
+  "resetPasswordTitle": "إعادة تعيين كلمة المرور",
+  "encryptionKeys": "مفاتيح التشفير",
+  "passwordWarning": "نحن لا نقوم بتخزين كلمة المرور هذه، لذا إذا نسيتها، <underline>لا يمكننا فك تشفير بياناتك</underline>",
+  "enterPasswordToEncrypt": "أدخل كلمة المرور التي يمكننا استخدامها لتشفير بياناتك",
+  "enterNewPasswordToEncrypt": "أدخل كلمة مرور جديدة يمكننا استخدامها لتشفير بياناتك",
+  "passwordChangedSuccessfully": "تم تغيير كلمة المرور بنجاح",
+  "generatingEncryptionKeys": "توليد مفاتيح التشفير...",
+  "continueLabel": "المتابعة",
+  "insecureDevice": "جهاز غير آمن",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "عذرًا، لم نتمكن من إنشاء مفاتيح آمنة على هذا الجهاز.\n\nيرجى التسجيل من جهاز مختلف.",
+  "howItWorks": "كيف يعمل",
+  "ackPasswordLostWarning": "أنا أفهم أنه إذا فقدت كلمة المرور الخاصة بي، قد أفقد بياناتي لأن بياناتي هي <underline>مشفرة من الند للند</underline>.",
+  "loginTerms": "بالنقر على تسجيل الدخول، أوافق على شروط الخدمة <u-terms></u-terms> و <u-policy>سياسة الخصوصية</u-policy>",
+  "logInLabel": "تسجيل الدخول",
+  "logout": "تسجيل الخروج",
+  "areYouSureYouWantToLogout": "هل أنت متأكد من أنك تريد تسجيل الخروج؟",
+  "yesLogout": "نعم، تسجيل الخروج",
+  "exit": "خروج",
+  "verifyingRecoveryKey": "التحقق من مفتاح الاسترداد...",
+  "recoveryKeyVerified": "تم التحقق من مفتاح الاسترداد",
+  "recoveryKeySuccessBody": "رائع! مفتاح الاسترداد الخاص بك صالح. شكرا لك على التحقق.\n\nيرجى تذكر الاحتفاظ بنسخة احتياطية من مفتاح الاسترداد بشكل آمن.",
+  "invalidRecoveryKey": "مفتاح الاسترداد الذي أدخلته غير صالح. الرجاء التأكد من أنه يحتوي على 24 كلمة، والتحقق من تهجئة كل منها.\n\nإذا قمت بإدخال رمز الاسترداد القديم، تأكد من أن طوله 64 حرفاً، وتحقق من كل منها.",
+  "recreatePasswordTitle": "إعادة كتابة كلمة المرور",
+  "recreatePasswordBody": "الجهاز الحالي ليس قويًا بما يكفي للتحقق من كلمة المرور الخاصة بك، لذا نحتاج إلى إعادة إنشائها مرة واحدة بطريقة تعمل مع جميع الأجهزة.\n\nالرجاء تسجيل الدخول باستخدام مفتاح الاسترداد وإعادة إنشاء كلمة المرور الخاصة بك (يمكنك استخدام نفس كلمة المرور مرة أخرى إذا كنت ترغب في ذلك).",
+  "invalidKey": "المفتاح غير صالح",
+  "tryAgain": "حاول مرة أخرى",
+  "viewRecoveryKey": "عرض مفتاح الاسترداد",
+  "confirmRecoveryKey": "تأكيد مفتاح الاسترداد",
+  "recoveryKeyVerifyReason": "مفتاح الاسترداد الخاص بك هو الطريقة الوحيدة لاسترداد صورك إذا نسيت كلمة المرور الخاصة بك. يمكنك العثور على مفتاح الاسترداد الخاص بك في الإعدادات > الحساب.\n\nالرجاء إدخال مفتاح الاسترداد الخاص بك هنا للتحقق من أنك قمت بحفظه بشكل صحيح.",
+  "confirmYourRecoveryKey": "تأكيد مفتاح الاسترداد",
+  "confirm": "تأكيد",
+  "emailYourLogs": "إرسال السجلات عبر البريد الإلكتروني",
+  "pleaseSendTheLogsTo": "الرجاء إرسال السجلات إلى {toEmail}",
+  "copyEmailAddress": "نسخ عنوان البريد الإلكتروني",
+  "exportLogs": "تصدير السجلات",
+  "enterYourRecoveryKey": "أدخل رمز الاسترداد",
+  "tempErrorContactSupportIfPersists": "يبدو أنه حدث خطأ ما. الرجاء إعادة المحاولة لاحقا. إذا استمر الخطأ، يرجى الاتصال بفريق الدعم.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "يبدو أنه حدث خطأ ما. الرجاء إعادة المحاولة لاحقا. إذا استمر الخطأ، يرجى الاتصال بفريق الدعم.",
+  "about": "حول",
+  "weAreOpenSource": "الخدمة مفتوحة المصدر!",
+  "privacy": "الخصوصية",
+  "terms": "الشروط",
+  "checkForUpdates": "بحث عن تحديثات",
+  "downloadUpdate": "تحميل",
+  "criticalUpdateAvailable": "تحديث حاسم متوفر",
+  "updateAvailable": "التحديث متاح",
+  "update": "تحديث",
+  "checking": "جارٍ التحقق...",
+  "youAreOnTheLatestVersion": "أنت في الإصدار الأخير",
+  "warning": "تحذير",
+  "exportWarningDesc": "الملف الذي تم تصديره يحتوي على معلومات حساسة. الرجاء تخزين هذا بشكل آمن.",
+  "iUnderStand": "فهمت",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "الرجاء المصادقة لتصدير الرموز الخاصة بك",
+  "importSuccessTitle": "مرحى!",
+  "importSuccessDesc": "لقد استوردت {count} رمز!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "المعذرة",
+  "importFailureDesc": "تعذر تحليل الملف المحدد.\nالرجاء الكتابة إلى support@ente.io إذا كنت بحاجة إلى مساعدة!",
+  "pendingSyncs": "تحذير",
+  "pendingSyncsWarningBody": "لم يتم نسخ بعض رموزك احتياطيًا.\n\nيرجى التأكد من أن لديك نسخة احتياطية لهذه الرموز قبل تسجيل الخروج.",
+  "checkInboxAndSpamFolder": "الرجاء التحقق من صندوق الوارد (والرسائل غير المرغوب فيها) لإكمال التحقق",
+  "tapToEnterCode": "انقر لإدخال الرمز",
+  "resendEmail": "إعادة إرسال البريد الإلكتروني",
+  "weHaveSendEmailTo": "لقد أرسلنا رسالة إلى <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"
+      }
+    }
+  },
+  "activeSessions": "الجلسات النشطة",
+  "somethingWentWrongPleaseTryAgain": "حدث خطأ ما، يرجى المحاولة مرة أخرى",
+  "thisWillLogYouOutOfThisDevice": "سيؤدي هذا إلى تسجيل خروجك من هذا الجهاز!",
+  "thisWillLogYouOutOfTheFollowingDevice": "سيؤدي هذا إلى تسجيل خروجك من هذا الجهاز:",
+  "terminateSession": "إنهاء الجلسة؟",
+  "terminate": "إنهاء",
+  "thisDevice": "هذا الجهاز",
+  "toResetVerifyEmail": "لإعادة تعيين كلمة المرور الخاصة بك، يرجى التحقق من بريدك الإلكتروني أولاً.",
+  "thisEmailIsAlreadyInUse": "هذا البريد مستخدم مسبقاً",
+  "verificationFailedPleaseTryAgain": "فشل في المصادقة ، يرجى المحاولة مرة أخرى في وقت لاحق",
+  "yourVerificationCodeHasExpired": "انتهت صلاحية رمز التحقق",
+  "incorrectCode": "رمز غير صحيح",
+  "sorryTheCodeYouveEnteredIsIncorrect": "عذراً، الرمز الذي أدخلته غير صحيح",
+  "emailChangedTo": "تم تغيير البريد الإلكتروني إلى {newEmail}",
+  "authenticationFailedPleaseTryAgain": "فشلت المصادقة. الرجاء المحاولة مرة أخرى",
+  "authenticationSuccessful": "تمت المصادقة بنجاح!",
+  "twofactorAuthenticationSuccessfullyReset": "تم تحديث المصادقة الثنائية بنجاح",
+  "incorrectRecoveryKey": "مفتاح الاسترداد غير صحيح",
+  "theRecoveryKeyYouEnteredIsIncorrect": "مفتاح الاسترداد الذي أدخلته غير صحيح",
+  "enterPassword": "أدخل كلمة المرور",
+  "selectExportFormat": "اختر صيغة التصدير",
+  "exportDialogDesc": "سيتم حماية الصادرات المشفرة بكلمة مرور من اختيارك.",
+  "encrypted": "مشفَّرة",
+  "plainText": "نص عادي",
+  "passwordToEncryptExport": "كلمة المرور لتشفير التصدير",
+  "export": "تصدير",
+  "useOffline": "استخدام بدون نسخ إحتياطية",
+  "signInToBackup": "قم بتسجيل الدخول للنسخ الاحتياطي للرموز الخاصة بك",
+  "singIn": "تسجل الدخول",
+  "sigInBackupReminder": "يرجى تصدير الرموز الخاصة بك للتأكد من أن لديك نسخة احتياطية يمكنك استعادتها منها.",
+  "offlineModeWarning": "لقد اخترت المضي قدما بدون نسخ احتياطية. يرجى أخذ نسخ احتياطية يدوية للتأكد من سلامة الرموز الخاصة بك.",
+  "showLargeIcons": "إظهار أيقونات كبيرة",
+  "shouldHideCode": "إخفاء الرموز",
+  "doubleTapToViewHiddenCode": "يمكنك النقر مرتين على أي عنصر لعرض الرمز",
+  "focusOnSearchBar": "التركيز على البحث عند بدء التطبيق",
+  "confirmUpdatingkey": "هل أنت متأكد من أنك تريد تحديث المفتاح السري؟",
+  "minimizeAppOnCopy": "تصغير التطبيق عند النسخ",
+  "editCodeAuthMessage": "المصادقة لتعديل الرمز",
+  "deleteCodeAuthMessage": "المصادقة لحذف الرمز",
+  "showQRAuthMessage": "المصادقة لإظهار رمز QR",
+  "confirmAccountDeleteTitle": "تأكيد حذف الحساب",
+  "confirmAccountDeleteMessage": "هذا الحساب مرتبط بتطبيقات Ente أخرى، إذا كنت تستخدم أي منها.\n\nبياناتك التي تم تحميلها، عبر جميع تطبيقات Ente سيتم جدولتها للحذف، وسيتم حذف حسابك بشكل دائم.",
+  "androidBiometricHint": "التحقق من الهوية",
+  "@androidBiometricHint": {
+    "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricNotRecognized": "لم يتم التعرف عليه. حاول مرة أخرى.",
+  "@androidBiometricNotRecognized": {
+    "description": "Message to let the user know that authentication was failed. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricSuccess": "تم بنجاح",
+  "@androidBiometricSuccess": {
+    "description": "Message to let the user know that authentication was successful. It is used on Android side. Maximum 60 characters."
+  },
+  "androidCancelButton": "إلغاء",
+  "@androidCancelButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on Android side. Maximum 30 characters."
+  },
+  "androidSignInTitle": "المصادقة مطلوبة",
+  "@androidSignInTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user that they need to scan biometric to continue. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricRequiredTitle": "البيومترية مطلوبة",
+  "@androidBiometricRequiredTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user has not set up biometric authentication on their device. It is used on Android side. Maximum 60 characters."
+  },
+  "androidDeviceCredentialsRequiredTitle": "بيانات اعتماد الجهاز مطلوبة",
+  "@androidDeviceCredentialsRequiredTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user has not set up credentials authentication on their device. It is used on Android side. Maximum 60 characters."
+  },
+  "androidDeviceCredentialsSetupDescription": "بيانات اعتماد الجهاز مطلوبة",
+  "@androidDeviceCredentialsSetupDescription": {
+    "description": "Message advising the user to go to the settings and configure device credentials on their device. It shows in a dialog on Android side."
+  },
+  "goToSettings": "الانتقال إلى الإعدادات",
+  "@goToSettings": {
+    "description": "Message showed on a button that the user can click to go to settings pages from the current dialog. It is used on both Android and iOS side. Maximum 30 characters."
+  },
+  "androidGoToSettingsDescription": "لم يتم إعداد المصادقة الحيوية على جهازك. انتقل إلى 'الإعدادات > الأمن' لإضافة المصادقة البيومترية.",
+  "@androidGoToSettingsDescription": {
+    "description": "Message advising the user to go to the settings and configure biometric on their device. It shows in a dialog on Android side."
+  },
+  "iOSLockOut": "المصادقة البيومترية معطلة. الرجاء قفل الشاشة وفتح القفل لتفعيلها.",
+  "@iOSLockOut": {
+    "description": "Message advising the user to re-enable biometrics on their device. It shows in a dialog on iOS side."
+  },
+  "iOSGoToSettingsDescription": "لم يتم إعداد المصادقة البيومترية على جهازك. الرجاء تمكين معرف اللمس أو معرف الوجه على هاتفك.",
+  "@iOSGoToSettingsDescription": {
+    "description": "Message advising the user to go to the settings and configure Biometrics for their device. It shows in a dialog on iOS side."
+  },
+  "iOSOkButton": "حسناً",
+  "@iOSOkButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on iOS side. Maximum 30 characters."
+  },
+  "noInternetConnection": "لا يوجد اتصال بالإنترنت",
+  "pleaseCheckYourInternetConnectionAndTryAgain": "يرجى التحقق من اتصالك بالإنترنت ثم المحاولة من جديد.",
+  "signOutFromOtherDevices": "تسجيل الخروج من الأجهزة الأخرى",
+  "signOutOtherBody": "إذا كنت تعتقد أن شخصا ما يعرف كلمة المرور الخاصة بك، يمكنك إجبار جميع الأجهزة الأخرى الستخدمة حاليا لحسابك على تسجيل الخروج.",
+  "signOutOtherDevices": "تسجيل الخروج من الأجهزة الأخرى",
+  "doNotSignOut": "لا تقم بتسجيل الخروج",
+  "hearUsWhereTitle": "كيف سمعت عن Ente؟ (اختياري)",
+  "hearUsExplanation": "نحن لا نتتبع تثبيت التطبيق. سيكون من المفيد إذا أخبرتنا أين وجدتنا!"
+}
--- a/auth/lib/l10n/arb/app_en.arb
+++ b/auth/lib/l10n/arb/app_en.arb
@ -59,7 +59,7 @@
    }
  },
  "contactSupport": "Contact support",
-  "rateUsOnStore" : "Rate us on {storeName}",
+  "rateUsOnStore": "Rate us on {storeName}",
  "blog": "Blog",
  "merchandise": "Merchandise",
  "verifyPassword": "Verify password",
@ -133,7 +133,6 @@
  "faq_q_5": "How can I enable FaceID lock in ente Auth",
  "faq_a_5": "You can enable FaceID lock under Settings → Security → Lockscreen.",
  "somethingWentWrongMessage": "Something went wrong, please try again",
-
  "leaveFamily": "Leave family",
  "leaveFamilyMessage": "Are you sure that you want to leave the family plan?",
  "inFamilyPlanMessage": "You are on a family plan!",
@ -145,6 +144,7 @@
  "enterCodeHint": "Enter the 6-digit code from\nyour authenticator app",
  "lostDeviceTitle": "Lost device?",
  "twoFactorAuthTitle": "Two-factor authentication",
+  "passkeyAuthTitle": "Passkey authentication",
  "recoverAccount": "Recover account",
  "enterRecoveryKeyHint": "Enter your recovery key",
  "recover": "Recover",
@ -337,10 +337,10 @@
  "offlineModeWarning": "You have chosen to proceed without backups. Please take manual backups to make sure your codes are safe.",
  "showLargeIcons": "Show large icons",
  "shouldHideCode": "Hide codes",
-  "doubleTapToViewHiddenCode" : "You can double tap on an entry to view code",
+  "doubleTapToViewHiddenCode": "You can double tap on an entry to view code",
  "focusOnSearchBar": "Focus search on app start",
  "confirmUpdatingkey": "Are you sure you want to update the secret key?",
-  "minimizeAppOnCopy":  "Minimize app on copy",
+  "minimizeAppOnCopy": "Minimize app on copy",
  "editCodeAuthMessage": "Authenticate to edit code",
  "deleteCodeAuthMessage": "Authenticate to delete code",
  "showQRAuthMessage": "Authenticate to show QR code",
@ -405,5 +405,8 @@
  "signOutOtherDevices": "Sign out other devices",
  "doNotSignOut": "Do not sign out",
  "hearUsWhereTitle": "How did you hear about Ente? (optional)",
-  "hearUsExplanation": "We don't track app installs. It'd help if you told us where you found us!"
-}
+  "hearUsExplanation": "We don't track app installs. It'd help if you told us where you found us!",
+  "waitingForBrowserRequest": "Waiting for browser request...",
+  "launchPasskeyUrlAgain": "Launch passkey URL again",
+  "passkey": "Passkey"
+}
--- a/auth/lib/l10n/arb/app_es.arb
+++ b/auth/lib/l10n/arb/app_es.arb
@ -1,5 +1,6 @@
 {
  "account": "Cuenta",
+  "unlock": "Desbloquear",
  "recoveryKey": "Clave de recuperación",
  "counterAppBarTitle": "Contador",
  "@counterAppBarTitle": {
@ -83,9 +84,13 @@
  "importFromApp": "Importar códigos de {appName}",
  "importGoogleAuthGuide": "Exportar tus cuentas desde Google Authenticator a un código QR usando la opción \"Transferir Cuentas\". A continuación, usando otro dispositivo, escanee el código QR.\n\nConsejo: Puede usar la webcam de su portátil para tomar una foto del código QR.",
  "importSelectJsonFile": "Seleccione el archivo JSON",
+  "importSelectAppExport": "Seleccione el archivo de exportación de {appName}",
  "importEnteEncGuide": "Seleccione el archivo JSON cifrado exportado desde ente",
  "importRaivoGuide": "Utilice la opción \"Exportar códigos a un archivo de Zip\" en la configuración de Raivo.\n\nExtraiga el archivo zip e importe el archivo JSON.",
+  "importBitwardenGuide": "Use la opción \"Exportar caja fuerte\" dentro del menú Herramientas de Bitwarden e importe el fichero JSON no crifrado.",
  "importAegisGuide": "Utilice la opción \"Exportar la bóveda\" en ajustes de Aegis.\n\nSi tu bóveda es cifrada, necesitara entrar contraseña de bóveda para descifrar la bóveda.",
+  "import2FasGuide": "Use la opción \"Configuración→Copia de seguridad→Exportar\" en 2FAS\n\nSi su copia de seguridad está cifrada, necesitará introducir la contraseña para descifrarla",
+  "importLastpassGuide": "Utilice la opción \"Transferir cuentas\" en la configuración del autenticador de Lastpass y pulse \"Exportar cuentas al archivo\". Importe el archivo JSON descargado.",
  "exportCodes": "Exportar códigos",
  "importLabel": "Importar",
  "importInstruction": "Por favor, seleccione un archivo que contenga una lista de sus códigos en el siguiente formato",
@ -97,6 +102,8 @@
  "authToViewYourRecoveryKey": "Por favor, autentifíquese para ver su clave de recuperación",
  "authToChangeYourEmail": "Por favor, autentifíquese para cambiar su correo electrónico",
  "authToChangeYourPassword": "Por favor, autentifíquese para cambiar su contraseña",
+  "authToViewSecrets": "Por favor, autentifíquese para ver sus secretos",
+  "authToInitiateSignIn": "Por favor, autentifíquese para iniciar la sesión para realizar la copia de seguridad.",
  "ok": "Ok",
  "cancel": "Cancelar",
  "yes": "Si",
@ -329,6 +336,7 @@
  "offlineModeWarning": "Ha elegido proceder sin copia de seguridad. Por favor, tome copias de seguridad manuales para asegurarse de que sus códigos están seguros.",
  "showLargeIcons": "Mostrar iconos grandes",
  "shouldHideCode": "Ocultar códigos",
+  "doubleTapToViewHiddenCode": "Puedes tocar dos veces en una entrada para ver el código",
  "focusOnSearchBar": "Enfocar búsqueda al iniciar la aplicación",
  "confirmUpdatingkey": "¿Estás seguro de que deseas actualizar la clave secreto?",
  "minimizeAppOnCopy": "Minimizar aplicación al copiar",
@ -336,5 +344,65 @@
  "deleteCodeAuthMessage": "Autenticar para borrar código",
  "showQRAuthMessage": "Autenticar para mostrar código QR",
  "confirmAccountDeleteTitle": "Confirmar eliminación de la cuenta",
-  "confirmAccountDeleteMessage": "Esta cuenta está vinculada a otras aplicaciones de ente, si utiliza alguna.\n\nSe programará la eliminación de los datos que cargue en todas las aplicaciones de ente y su cuenta se eliminará permanentemente."
+  "confirmAccountDeleteMessage": "Esta cuenta está vinculada a otras aplicaciones de ente, si utiliza alguna.\n\nSe programará la eliminación de los datos que cargue en todas las aplicaciones de ente y su cuenta se eliminará permanentemente.",
+  "androidBiometricHint": "Verificar identidad",
+  "@androidBiometricHint": {
+    "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricNotRecognized": "No reconocido. Inténtelo de nuevo.",
+  "@androidBiometricNotRecognized": {
+    "description": "Message to let the user know that authentication was failed. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricSuccess": "Realizado correctamente",
+  "@androidBiometricSuccess": {
+    "description": "Message to let the user know that authentication was successful. It is used on Android side. Maximum 60 characters."
+  },
+  "androidCancelButton": "Cancelar",
+  "@androidCancelButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on Android side. Maximum 30 characters."
+  },
+  "androidSignInTitle": "Se requiere autenticación",
+  "@androidSignInTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user that they need to scan biometric to continue. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricRequiredTitle": "Biométrica necesaria",
+  "@androidBiometricRequiredTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user has not set up biometric authentication on their device. It is used on Android side. Maximum 60 characters."
+  },
+  "androidDeviceCredentialsRequiredTitle": "Se necesitan credenciales de dispositivo",
+  "@androidDeviceCredentialsRequiredTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user has not set up credentials authentication on their device. It is used on Android side. Maximum 60 characters."
+  },
+  "androidDeviceCredentialsSetupDescription": "Se necesitan credenciales de dispositivo",
+  "@androidDeviceCredentialsSetupDescription": {
+    "description": "Message advising the user to go to the settings and configure device credentials on their device. It shows in a dialog on Android side."
+  },
+  "goToSettings": "Ir a Ajustes",
+  "@goToSettings": {
+    "description": "Message showed on a button that the user can click to go to settings pages from the current dialog. It is used on both Android and iOS side. Maximum 30 characters."
+  },
+  "androidGoToSettingsDescription": "La autenticación biométrica no está configurada en su dispositivo. Vaya a 'Ajustes > Seguridad' para añadir autenticación biométrica.",
+  "@androidGoToSettingsDescription": {
+    "description": "Message advising the user to go to the settings and configure biometric on their device. It shows in a dialog on Android side."
+  },
+  "iOSLockOut": "La autenticación biométrica está deshabilitada. Por favor bloquee y desbloquee la pantalla para habilitarla.",
+  "@iOSLockOut": {
+    "description": "Message advising the user to re-enable biometrics on their device. It shows in a dialog on iOS side."
+  },
+  "iOSGoToSettingsDescription": "La autenticación biométrica no está configurada en tu dispositivo. Por favor, activa Touch ID o Face ID en tu teléfono.",
+  "@iOSGoToSettingsDescription": {
+    "description": "Message advising the user to go to the settings and configure Biometrics for their device. It shows in a dialog on iOS side."
+  },
+  "iOSOkButton": "Aceptar",
+  "@iOSOkButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on iOS side. Maximum 30 characters."
+  },
+  "noInternetConnection": "No hay conexión a Internet",
+  "pleaseCheckYourInternetConnectionAndTryAgain": "Compruebe su conexión a Internet e inténtelo de nuevo.",
+  "signOutFromOtherDevices": "Cerrar sesión desde otros dispositivos",
+  "signOutOtherBody": "Si cree que alguien puede conocer su contraseña, puede forzar a todos los demás dispositivos que usen su cuenta a cerrar la sesión.",
+  "signOutOtherDevices": "Cerrar la sesión de otros dispositivos",
+  "doNotSignOut": "No cerrar la sesión",
+  "hearUsWhereTitle": "¿Cómo conoció Ente? (opcional)",
+  "hearUsExplanation": "No rastreamos las aplicaciones instaladas. ¡Nos ayudaría si nos dijera dónde nos encontró!"
 }
--- a/auth/lib/l10n/arb/app_ru.arb
+++ b/auth/lib/l10n/arb/app_ru.arb
@ -8,7 +8,7 @@
  },
  "onBoardingBody": "Храните ваши коды двухфакторной аутентификации в безопасности",
  "onBoardingGetStarted": "Начать",
-  "setupFirstAccount": "Настройте свою первую учетную запись",
+  "setupFirstAccount": "Настройте свой первый аккаунт",
  "importScanQrCode": "Сканировать QR-код",
  "qrCode": "QR-код",
  "importEnterSetupKey": "Ввести ключ настройки",
@ -71,8 +71,8 @@
  "incorrectPasswordTitle": "Неправильный пароль",
  "welcomeBack": "С возвращением!",
  "madeWithLoveAtPrefix": "сделана с ❤️ в ",
-  "supportDevs": "Подпишитесь на <bold-green>ente</bold-green> для поддержки этого проекта.",
-  "supportDiscount": "Используйте код скидки \"AUTH\", чтобы получить скидку 10% в первый год",
+  "supportDevs": "Подпишитесь на <bold-green>ente</bold-green> для поддержки нашего проекта",
+  "supportDiscount": "Используйте код скидки \"AUTH\", чтобы получить скидку 10% на первый год",
  "changeEmail": "Изменить почту",
  "changePassword": "Изменить пароль",
  "data": "Данные",
@ -84,10 +84,12 @@
  "importFromApp": "Импорт кодов из {appName}",
  "importGoogleAuthGuide": "Экспортируйте учетные записи из Google Authenticator в QR-код, используя опцию «Перенести учетные записи». Затем с помощью другого устройства отсканируйте QR-код.\n\nСовет: Чтобы сфотографировать QR-код, можно воспользоваться веб-камерой ноутбука.",
  "importSelectJsonFile": "Выбрать JSON-файл",
+  "importSelectAppExport": "Выбрать файл экспорта {appName}",
  "importEnteEncGuide": "Выберите зашифрованный JSON-файл, экспортированный из ente",
  "importRaivoGuide": "Используйте опцию «Export OTPs to Zip archive» в настройках Raivo.\n\nРаспакуйте zip-архив и импортируйте JSON-файл.",
  "importBitwardenGuide": "Используйте опцию \"Экспортировать хранилище\" в Bitwarden Tools и импортируйте незашифрованный JSON файл.",
  "importAegisGuide": "Используйте опцию «Экспортировать хранилище» в настройках Aegis.\n\nЕсли ваше хранилище зашифровано, то для его расшифровки потребуется ввести пароль хранилища.",
+  "import2FasGuide": "Используйте опцию \"Settings->Backup -Export\" в 2FAS.\n\nЕсли ваша резервная копия зашифрована, то для расшифровки резервной копии необходимо ввести пароль",
  "exportCodes": "Экспортировать коды",
  "importLabel": "Импорт",
  "importInstruction": "Пожалуйста, выберите файл, содержащий список ваших кодов в следующем формате",
--- a/auth/lib/l10n/arb/app_sv.arb
+++ b/auth/lib/l10n/arb/app_sv.arb
@ -0,0 +1,87 @@
+{
+  "account": "Konto",
+  "unlock": "Lås upp",
+  "recoveryKey": "Återställningsnyckel",
+  "onBoardingBody": "Säkerhetskopiera dina 2FA-koder",
+  "onBoardingGetStarted": "Kom igång",
+  "setupFirstAccount": "Konfigurera ditt första konto",
+  "importScanQrCode": "Skanna en QR-kod",
+  "qrCode": "QR-kod",
+  "importEnterSetupKey": "Ange en konfigurationskod",
+  "importAccountPageTitle": "Ange kontodetaljer",
+  "secretCanNotBeEmpty": "Secret kan inte vara tomt",
+  "bothIssuerAndAccountCanNotBeEmpty": "Både utgivare och konto kan inte vara tomma",
+  "incorrectDetails": "Felaktiga uppgifter",
+  "pleaseVerifyDetails": "Kontrollera dina detaljer och försök igen",
+  "codeIssuerHint": "Utfärdare",
+  "codeSecretKeyHint": "Secret Key",
+  "codeAccountHint": "Konto (du@domän.com)",
+  "accountKeyType": "Typ av nyckel",
+  "sessionExpired": "Sessionen har gått ut",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Vänligen logga in igen",
+  "loggingOut": "Loggar ut...",
+  "saveAction": "Spara",
+  "nextTotpTitle": "nästa",
+  "deleteCodeMessage": "Vill du ta bort den här koden? Det går inte att ångra den här åtgärden.",
+  "viewLogsAction": "Visa loggar",
+  "emailLogsTitle": "E-posta loggar",
+  "emailLogsMessage": "Skicka loggarna till {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "Kopiera e-post",
+  "exportLogsAction": "Exportera loggar",
+  "reportABug": "Rapportera en bugg",
+  "crashAndErrorReporting": "Krasch och felrapportering",
+  "reportBug": "Rapportera bugg",
+  "emailUsMessage": "Skicka e-mail till {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Kontakta support",
+  "rateUsOnStore": "Betygsätt på {storeName}",
+  "blog": "Blogg",
+  "merchandise": "Merchandise",
+  "verifyPassword": "Bekräfta lösenord",
+  "pleaseWait": "Vänligen vänta...",
+  "generatingEncryptionKeysTitle": "Skapar krypteringsnycklar...",
+  "recreatePassword": "Återskapa lösenord",
+  "useRecoveryKey": "Använd återställningsnyckel",
+  "incorrectPasswordTitle": "Felaktigt lösenord",
+  "pleaseTryAgain": "Försök igen",
+  "existingUser": "Befintlig användare",
+  "delete": "Radera",
+  "enterYourPasswordHint": "Ange ditt lösenord",
+  "forgotPassword": "Glömt lösenord",
+  "oops": "Hoppsan",
+  "suggestFeatures": "Föreslå funktionalitet",
+  "faq": "FAQ",
+  "faq_q_1": "Hur säkert är ente Auth?",
+  "weakStrength": "Svag",
+  "strongStrength": "Stark",
+  "moderateStrength": "Måttligt",
+  "searchHint": "Sök...",
+  "search": "Sök",
+  "sorryUnableToGenCode": "Tyvärr, det gick inte att generera en kod för {issuerName}",
+  "noResult": "Inga resultat",
+  "addCode": "Lägg till kod",
+  "scanAQrCode": "Skanna en QR-kod",
+  "enterDetailsManually": "Ange uppgifter manuellt",
+  "edit": "Redigera",
+  "copiedToClipboard": "Kopierat till urklipp",
+  "copiedNextToClipboard": "Kopierade nästa kod till urklipp",
+  "error": "Fel",
+  "recoveryKeyCopiedToClipboard": "Återställningsnyckel kopierad till urklipp",
+  "recoveryKeyOnForgotPassword": "Om du glömmer ditt lösenord är det enda sättet du kan återställa dina data med denna nyckel."
+}
--- a/auth/lib/l10n/arb/app_th.arb
+++ b/auth/lib/l10n/arb/app_th.arb
@ -0,0 +1 @@
+{}
--- a/auth/lib/main.dart
+++ b/auth/lib/main.dart
@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:computer/computer.dart';
 import "package:ente_auth/app/view/app.dart";
@ -33,7 +35,9 @@ void main() async {
  WidgetsFlutterBinding.ensureInitialized();
  await _runInForeground();
  await _setupPrivacyScreen();
-  FlutterDisplayMode.setHighRefreshRate();
+  if (Platform.isAndroid) {
+    FlutterDisplayMode.setHighRefreshRate().ignore();
+  }
 }

 Future<void> _runInForeground() async {
--- a/auth/lib/services/auth_feature_flag.dart
+++ b/auth/lib/services/auth_feature_flag.dart
@ -0,0 +1,23 @@
+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;
+  }
+}
--- a/auth/lib/services/passkey_service.dart
+++ b/auth/lib/services/passkey_service.dart
@ -0,0 +1,33 @@
+import 'package:ente_auth/core/network.dart';
+import 'package:ente_auth/utils/dialog_util.dart';
+import 'package:flutter/widgets.dart';
+import 'package:logging/logging.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class PasskeyService {
+  PasskeyService._privateConstructor();
+  static final PasskeyService instance = PasskeyService._privateConstructor();
+
+  final _enteDio = Network.instance.enteDio;
+
+  Future<String> getJwtToken() async {
+    final response = await _enteDio.get(
+      "/users/accounts-token",
+    );
+    return response.data!["accountsToken"] as String;
+  }
+
+  Future<void> openPasskeyPage(BuildContext context) async {
+    try {
+      final jwtToken = await getJwtToken();
+      final url = "https://accounts.ente.io/account-handoff?token=$jwtToken";
+      await launchUrlString(
+        url,
+        mode: LaunchMode.externalApplication,
+      );
+    } catch (e) {
+      Logger('PasskeyService').severe("failed to open passkey page", e);
+      showGenericErrorDialog(context: context).ignore();
+    }
+  }
+}
--- a/auth/lib/services/user_service.dart
+++ b/auth/lib/services/user_service.dart
@ -26,6 +26,7 @@ import 'package:ente_auth/ui/account/password_reentry_page.dart';
 import 'package:ente_auth/ui/account/recovery_page.dart';
 import 'package:ente_auth/ui/common/progress_dialog.dart';
 import 'package:ente_auth/ui/home_page.dart';
+import 'package:ente_auth/ui/passkey_page.dart';
 import 'package:ente_auth/ui/two_factor_authentication_page.dart';
 import 'package:ente_auth/ui/two_factor_recovery_page.dart';
 import 'package:ente_auth/utils/crypto_util.dart';
@ -264,6 +265,33 @@ class UserService {
    }
  }

+  Future<void> onPassKeyVerified(BuildContext context, Map response) async {
+    final userPassword = Configuration.instance.getVolatilePassword();
+    if (userPassword == null) throw Exception("volatile password is null");
+
+    await _saveConfiguration(response);
+
+    Widget page;
+    if (Configuration.instance.getEncryptedToken() != null) {
+      await Configuration.instance.decryptSecretsAndGetKeyEncKey(
+        userPassword,
+        Configuration.instance.getKeyAttributes()!,
+      );
+      page = const HomePage();
+    } else {
+      throw Exception("unexpected response during passkey verification");
+    }
+
+    Navigator.of(context).pushAndRemoveUntil(
+      MaterialPageRoute(
+        builder: (BuildContext context) {
+          return page;
+        },
+      ),
+      (route) => route.isFirst,
+    );
+  }
+
  Future<void> verifyEmail(
    BuildContext context,
    String ott, {
@ -487,9 +515,9 @@ class UserService {
        final clientS = client.calculateSecret(serverB);
        final clientM = client.calculateClientEvidenceMessage();
        // ignore: unused_local_variable
-        late Response srpCompleteResponse;
+        late Response _;
        if (setKeysRequest == null) {
-          srpCompleteResponse = await _enteDio.post(
+          _ = await _enteDio.post(
            "/users/srp/complete",
            data: {
              'setupID': setupSRPResponse.setupID,
@ -497,7 +525,7 @@ class UserService {
            },
          );
        } else {
-          srpCompleteResponse = await _enteDio.post(
+          _ = await _enteDio.post(
            "/users/srp/update",
            data: {
              'setupID': setupSRPResponse.setupID,
@ -581,11 +609,15 @@ class UserService {
      },
    );
    if (response.statusCode == 200) {
-      Widget page;
+      Widget? page;
+      final String passkeySessionID = response.data["passkeySessionID"];
      final String twoFASessionID = response.data["twoFactorSessionID"];
      Configuration.instance.setVolatilePassword(userPassword);
+
      if (twoFASessionID.isNotEmpty) {
        page = TwoFactorAuthenticationPage(twoFASessionID);
+      } else if (passkeySessionID.isNotEmpty) {
+        page = PasskeyPage(passkeySessionID);
      } else {
        await _saveConfiguration(response);
        if (Configuration.instance.getEncryptedToken() != null) {
@ -603,7 +635,7 @@ class UserService {
      Navigator.of(context).pushAndRemoveUntil(
        MaterialPageRoute(
          builder: (BuildContext context) {
-            return page;
+            return page!;
          },
        ),
        (route) => route.isFirst,
@ -861,16 +893,19 @@ class UserService {
    }
  }

-  Future<void> _saveConfiguration(Response response) async {
-    await Configuration.instance.setUserID(response.data["id"]);
-    if (response.data["encryptedToken"] != null) {
+  Future<void> _saveConfiguration(dynamic response) async {
+    final responseData = response is Map ? response : response.data as Map?;
+    if (responseData == null) return;
+
+    await Configuration.instance.setUserID(responseData["id"]);
+    if (responseData["encryptedToken"] != null) {
      await Configuration.instance
-          .setEncryptedToken(response.data["encryptedToken"]);
+          .setEncryptedToken(responseData["encryptedToken"]);
      await Configuration.instance.setKeyAttributes(
-        KeyAttributes.fromMap(response.data["keyAttributes"]),
+        KeyAttributes.fromMap(responseData["keyAttributes"]),
      );
    } else {
-      await Configuration.instance.setToken(response.data["token"]);
+      await Configuration.instance.setToken(responseData["token"]);
    }
  }

--- a/auth/lib/store/offline_authenticator_db.dart
+++ b/auth/lib/store/offline_authenticator_db.dart
@ -15,7 +15,8 @@ class OfflineAuthenticatorDB {
  static const entityTable = 'entities';

  OfflineAuthenticatorDB._privateConstructor();
-  static final OfflineAuthenticatorDB instance = OfflineAuthenticatorDB._privateConstructor();
+  static final OfflineAuthenticatorDB instance =
+      OfflineAuthenticatorDB._privateConstructor();

  static Future<Database>? _dbFuture;

@ -26,7 +27,7 @@ class OfflineAuthenticatorDB {

  Future<Database> _initDatabase() async {
    final Directory documentsDirectory =
-    await getApplicationDocumentsDirectory();
+        await getApplicationDocumentsDirectory();
    final String path = join(documentsDirectory.path, _databaseName);
    debugPrint(path);
    return await openDatabase(
@ -70,10 +71,10 @@ class OfflineAuthenticatorDB {
  }

  Future<int> updateEntry(
-      int generatedID,
-      String encData,
-      String header,
-      ) async {
+    int generatedID,
+    String encData,
+    String header,
+  ) async {
    final db = await instance.database;
    final int timeInMicroSeconds = DateTime.now().microsecondsSinceEpoch;
    int affectedRows = await db.update(
--- a/auth/lib/ui/passkey_page.dart
+++ b/auth/lib/ui/passkey_page.dart
@ -0,0 +1,115 @@
+import 'dart:convert';
+
+import 'package:ente_auth/core/configuration.dart';
+import 'package:ente_auth/ente_theme_data.dart';
+import 'package:ente_auth/l10n/l10n.dart';
+import 'package:ente_auth/services/user_service.dart';
+import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
+import 'package:uni_links/uni_links.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class PasskeyPage extends StatefulWidget {
+  final String sessionID;
+
+  const PasskeyPage(
+    this.sessionID, {
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  State<PasskeyPage> createState() => _PasskeyPageState();
+}
+
+class _PasskeyPageState extends State<PasskeyPage> {
+  final Logger _logger = Logger("PasskeyPage");
+
+  @override
+  void initState() {
+    launchPasskey();
+    _initDeepLinks();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  Future<void> launchPasskey() async {
+    await launchUrlString(
+      "https://accounts.ente.io/passkeys/flow?"
+      "passkeySessionID=${widget.sessionID}"
+      "&redirect=enteauth://passkey",
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
+  Future<void> _handleDeeplink(String? link) async {
+    if (!context.mounted ||
+        Configuration.instance.hasConfiguredAccount() ||
+        link == null) {
+      return;
+    }
+    if (mounted && link.toLowerCase().startsWith("enteauth://passkey")) {
+      final uri = Uri.parse(link).queryParameters['response'];
+      // response to json
+      final res = utf8.decode(base64.decode(uri!));
+      final json = jsonDecode(res) as Map<String, dynamic>;
+      await UserService.instance.onPassKeyVerified(context, json);
+    }
+  }
+
+  Future<bool> _initDeepLinks() async {
+    // Attach a listener to the stream
+    linkStream.listen(
+      _handleDeeplink,
+      onError: (err) {
+        _logger.severe(err);
+      },
+    );
+    return false;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(
+          l10n.passkeyAuthTitle,
+        ),
+      ),
+      body: _getBody(),
+    );
+  }
+
+  Widget _getBody() {
+    final l10n = context.l10n;
+
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Text(
+            l10n.waitingForBrowserRequest,
+            style: const TextStyle(
+              height: 1.4,
+              fontSize: 16,
+            ),
+          ),
+          const SizedBox(height: 16),
+          Container(
+            width: double.infinity,
+            padding: const EdgeInsets.symmetric(horizontal: 32),
+            child: ElevatedButton(
+              style: Theme.of(context).colorScheme.optionalActionButtonStyle,
+              onPressed: launchPasskey,
+              child: Text(l10n.launchPasskeyUrlAgain),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/auth/lib/ui/settings/about_section_widget.dart
+++ b/auth/lib/ui/settings/about_section_widget.dart
@ -36,7 +36,7 @@ class AboutSectionWidget extends StatelessWidget {
          trailingIcon: Icons.chevron_right_outlined,
          trailingIconIsMuted: true,
          onTap: () async {
-            launchUrl(Uri.parse("https://github.com/ente-io/auth"));
+            launchUrl(Uri.parse("https://github.com/ente-io/ente"));
          },
        ),
        sectionOptionSpacing,
--- a/auth/lib/ui/settings/account_section_widget.dart
+++ b/auth/lib/ui/settings/account_section_widget.dart
@ -1,5 +1,4 @@
-
-
+import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/services/local_authentication_service.dart';
 import 'package:ente_auth/services/user_service.dart';
@ -7,6 +6,7 @@ import 'package:ente_auth/theme/ente_theme.dart';
 import 'package:ente_auth/ui/account/change_email_dialog.dart';
 import 'package:ente_auth/ui/account/delete_account_page.dart';
 import 'package:ente_auth/ui/account/password_entry_page.dart';
+import 'package:ente_auth/ui/account/recovery_key_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';
@ -14,6 +14,7 @@ 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';
+import 'package:flutter_sodium/flutter_sodium.dart';

 class AccountSectionWidget extends StatelessWidget {
  AccountSectionWidget({Key? key}) : super(key: key);
@ -86,6 +87,41 @@ class AccountSectionWidget extends StatelessWidget {
        },
      ),
      sectionOptionSpacing,
+      MenuItemWidget(
+        captionedTextWidget: CaptionedTextWidget(
+          title: l10n.recoveryKey,
+        ),
+        pressedColor: getEnteColorScheme(context).fillFaint,
+        trailingIcon: Icons.chevron_right_outlined,
+        trailingIconIsMuted: true,
+        onTap: () async {
+          final hasAuthenticated = await LocalAuthenticationService.instance
+              .requestLocalAuthentication(
+            context,
+            l10n.authToViewYourRecoveryKey,
+          );
+          if (hasAuthenticated) {
+            String recoveryKey;
+            try {
+              recoveryKey =
+                  Sodium.bin2hex(Configuration.instance.getRecoveryKey());
+            } catch (e) {
+              showGenericErrorDialog(context: context);
+              return;
+            }
+            routeToPage(
+              context,
+              RecoveryKeyPage(
+                recoveryKey,
+                l10n.ok,
+                showAppBar: true,
+                onDone: () {},
+              ),
+            );
+          }
+        },
+      ),
+      sectionOptionSpacing,
      MenuItemWidget(
        captionedTextWidget: CaptionedTextWidget(
          title: context.l10n.logout,
@ -115,6 +151,7 @@ class AccountSectionWidget extends StatelessWidget {
      children: children,
    );
  }
+
  void _onLogoutTapped(BuildContext context) {
    showChoiceActionSheet(
      context,
--- a/auth/lib/ui/settings/data/data_section_widget.dart
+++ b/auth/lib/ui/settings/data/data_section_widget.dart
@ -1,4 +1,3 @@
-
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/theme/ente_theme.dart';
 import 'package:ente_auth/ui/components/captioned_text_widget.dart';
--- a/auth/lib/ui/settings/security_section_widget.dart
+++ b/auth/lib/ui/settings/security_section_widget.dart
@ -4,10 +4,11 @@ import 'dart:typed_data';
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/models/user_details.dart';
+import 'package:ente_auth/services/auth_feature_flag.dart';
 import 'package:ente_auth/services/local_authentication_service.dart';
+import 'package:ente_auth/services/passkey_service.dart';
 import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/theme/ente_theme.dart';
-import 'package:ente_auth/ui/account/recovery_key_page.dart';
 import 'package:ente_auth/ui/account/request_pwd_verification_page.dart';
 import 'package:ente_auth/ui/account/sessions_page.dart';
 import 'package:ente_auth/ui/components/captioned_text_widget.dart';
@ -20,7 +21,6 @@ import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:ente_auth/utils/navigation_util.dart';
 import 'package:ente_auth/utils/toast_util.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_sodium/flutter_sodium.dart';

 class SecuritySectionWidget extends StatefulWidget {
  const SecuritySectionWidget({Key? key}) : super(key: key);
@ -63,42 +63,21 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
        // We don't know if the user can disable MFA yet, so we fetch the info
        UserService.instance.getUserDetailsV2().ignore();
      }
+      final bool isInternalUser =
+          FeatureFlagService.instance.isInternalUserOrDebugBuild();
      children.addAll([
-        sectionOptionSpacing,
-        MenuItemWidget(
-          captionedTextWidget: CaptionedTextWidget(
-            title: l10n.recoveryKey,
+        if (isInternalUser) sectionOptionSpacing,
+        if (isInternalUser)
+          MenuItemWidget(
+            captionedTextWidget: CaptionedTextWidget(
+              title: l10n.passkey,
+            ),
+            pressedColor: getEnteColorScheme(context).fillFaint,
+            trailingIcon: Icons.chevron_right_outlined,
+            trailingIconIsMuted: true,
+            onTap: () => PasskeyService.instance.openPasskeyPage(context),
          ),
-          pressedColor: getEnteColorScheme(context).fillFaint,
-          trailingIcon: Icons.chevron_right_outlined,
-          trailingIconIsMuted: true,
-          onTap: () async {
-            final hasAuthenticated = await LocalAuthenticationService.instance
-                .requestLocalAuthentication(
-              context,
-              l10n.authToViewYourRecoveryKey,
-            );
-            if (hasAuthenticated) {
-              String recoveryKey;
-              try {
-                recoveryKey =
-                    Sodium.bin2hex(Configuration.instance.getRecoveryKey());
-              } catch (e) {
-                showGenericErrorDialog(context: context);
-                return;
-              }
-              routeToPage(
-                context,
-                RecoveryKeyPage(
-                  recoveryKey,
-                  l10n.ok,
-                  showAppBar: true,
-                  onDone: () {},
-                ),
-              );
-            }
-          },
-        ),
+        sectionOptionSpacing,
        MenuItemWidget(
          captionedTextWidget: CaptionedTextWidget(
            title: l10n.emailVerificationToggle,
--- a/auth/lib/ui/settings/support_section_widget.dart
+++ b/auth/lib/ui/settings/support_section_widget.dart
@ -62,7 +62,7 @@ class _SupportSectionWidgetState extends State<SupportSectionWidget> {
          trailingIconIsMuted: true,
          onTap: () async {
            launchUrlString(
-              githubIssuesUrl,
+              githubDiscussionsUrl,
              mode: LaunchMode.externalApplication,
            );
          },
--- a/auth/migration-guides/decrypt/bin/ente-decrypt-darwin-amd64
+++ b/auth/migration-guides/decrypt/bin/ente-decrypt-darwin-amd64
--- a/auth/migration-guides/decrypt/bin/ente-decrypt-darwin-arm64
+++ b/auth/migration-guides/decrypt/bin/ente-decrypt-darwin-arm64
--- a/auth/migration-guides/decrypt/bin/ente-decrypt-linux-386
+++ b/auth/migration-guides/decrypt/bin/ente-decrypt-linux-386
--- a/auth/migration-guides/decrypt/bin/ente-decrypt-linux-amd64
+++ b/auth/migration-guides/decrypt/bin/ente-decrypt-linux-amd64
--- a/auth/migration-guides/decrypt/bin/ente-decrypt-linux-arm
+++ b/auth/migration-guides/decrypt/bin/ente-decrypt-linux-arm
--- a/auth/migration-guides/decrypt/bin/ente-decrypt-linux-arm64
+++ b/auth/migration-guides/decrypt/bin/ente-decrypt-linux-arm64
--- a/auth/migration-guides/decrypt/bin/ente-decrypt-windows-386.exe
+++ b/auth/migration-guides/decrypt/bin/ente-decrypt-windows-386.exe
--- a/auth/migration-guides/decrypt/bin/ente-decrypt-windows-amd64.exe
+++ b/auth/migration-guides/decrypt/bin/ente-decrypt-windows-amd64.exe
--- a/auth/migration-guides/decrypt/crypt.go
+++ b/auth/migration-guides/decrypt/crypt.go
@ -1,82 +0,0 @@
-package main
-
-import (
-	"encoding/base64"
-	"errors"
-	"fmt"
-
-	"golang.org/x/crypto/argon2"
-)
-
-// deriveArgonKey generates a 32-bit cryptographic key using the Argon2id algorithm.
-// Parameters:
-//   - password: The plaintext password to be hashed.
-//   - salt: The salt as a base64 encoded string.
-//   - memLimit: The memory limit in bytes.
-//   - opsLimit: The number of iterations.
-//
-// Returns:
-//   - A byte slice representing the derived key.
-//   - An error object, which is nil if no error occurs.
-func deriveArgonKey(password, salt string, memLimit, opsLimit int) ([]byte, error) {
-	if memLimit < 1024 || opsLimit < 1 {
-		return nil, fmt.Errorf("invalid memory or operation limits")
-	}
-
-	// Decode salt from base64
-	saltBytes, err := base64.StdEncoding.DecodeString(salt)
-	if err != nil {
-		return nil, fmt.Errorf("invalid salt: %v", err)
-	}
-
-	// Generate key using Argon2id
-	// Note: We're assuming a fixed key length of 32 bytes and changing the threads
-	key := argon2.IDKey([]byte(password), saltBytes, uint32(opsLimit), uint32(memLimit/1024), 1, 32)
-
-	return key, nil
-}
-
-// decryptChaCha20poly1305 decrypts the given data using the ChaCha20-Poly1305 algorithm.
-// Parameters:
-//   - data: The encrypted data as a byte slice.
-//   - key: The key for decryption as a byte slice.
-//   - nonce: The nonce for decryption as a byte slice.
-//
-// Returns:
-//   - A byte slice representing the decrypted data.
-//   - An error object, which is nil if no error occurs.
-// func decryptChaCha20poly13052(data []byte, key []byte, nonce []byte) ([]byte, error) {
-// 	reader := bytes.NewReader(data)
-// 	header := sodium.SecretStreamXCPHeader{Bytes: nonce}
-// 	decoder, err := sodium.MakeSecretStreamXCPDecoder(
-// 		sodium.SecretStreamXCPKey{Bytes: key},
-// 		reader,
-// 		header)
-// 	if err != nil {
-// 		log.Println("Failed to make secret stream decoder", err)
-// 		return nil, err
-// 	}
-// 	// Buffer to store the decrypted data
-// 	decryptedData := make([]byte, len(data))
-// 	n, err := decoder.Read(decryptedData)
-// 	if err != nil && err != io.EOF {
-// 		log.Println("Failed to read from decoder", err)
-// 		return nil, err
-// 	}
-// 	return decryptedData[:n], nil
-// }
-
-func decryptChaCha20poly13052(data []byte, key []byte, nonce []byte) ([]byte, error) {
-	decryptor, err := NewDecryptor(key, nonce)
-	if err != nil {
-		return nil, err
-	}
-	decoded, tag, err := decryptor.Pull(data)
-	if tag != TagFinal {
-		return nil, errors.New("invalid tag")
-	}
-	if err != nil {
-		return nil, err
-	}
-	return decoded, nil
-}
--- a/auth/migration-guides/decrypt/crypt_test.go
+++ b/auth/migration-guides/decrypt/crypt_test.go
@ -1,53 +0,0 @@
-package main
-
-import (
-	"encoding/base64"
-	"testing"
-)
-
-const (
-	password           = "test_password"
-	kdfSalt            = "vd0dcYMGNLKn/gpT6uTFTw=="
-	memLimit           = 64 * 1024 * 1024 // 64MB
-	opsLimit           = 2
-	cipherText         = "kBXQ2PuX6y/aje5r22H0AehRPh6sQ0ULoeAO"
-	cipherNonce        = "v7wsI+BFZsRMIjDm3rTxPhmi/CaUdkdJ"
-	expectedPlainText  = "plain_text"
-	expectedDerivedKey = "vp8d8Nee0BbIML4ab8Cp34uYnyrN77cRwTl920flyT0="
-)
-
-func TestDeriveArgonKey(t *testing.T) {
-	derivedKey, err := deriveArgonKey(password, kdfSalt, memLimit, opsLimit)
-	if err != nil {
-		t.Fatalf("Failed to derive key: %v", err)
-	}
-
-	if base64.StdEncoding.EncodeToString(derivedKey) != expectedDerivedKey {
-		t.Fatalf("Derived key does not match expected key")
-	}
-}
-
-func TestDecryptChaCha20poly1305(t *testing.T) {
-	derivedKey, err := deriveArgonKey(password, kdfSalt, memLimit, opsLimit)
-	if err != nil {
-		t.Fatalf("Failed to derive key: %v", err)
-	}
-
-	decodedCipherText, err := base64.StdEncoding.DecodeString(cipherText)
-	if err != nil {
-		t.Fatalf("Failed to decode cipher text: %v", err)
-	}
-
-	decodedCipherNonce, err := base64.StdEncoding.DecodeString(cipherNonce)
-	if err != nil {
-		t.Fatalf("Failed to decode cipher nonce: %v", err)
-	}
-
-	decryptedText, err := decryptChaCha20poly13052(decodedCipherText, derivedKey, decodedCipherNonce)
-	if err != nil {
-		t.Fatalf("Failed to decrypt: %v", err)
-	}
-	if string(decryptedText) != expectedPlainText {
-		t.Fatalf("Decrypted text : %s does not match the expected text: %s", string(decryptedText), expectedPlainText)
-	}
-}
--- a/auth/migration-guides/decrypt/decrypt.go
+++ b/auth/migration-guides/decrypt/decrypt.go
@ -1,105 +0,0 @@
-package main
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"os"
-)
-
-type Export struct {
-	Version         int    `json:"version"`
-	KDFParams       KDF    `json:"kdfParams"`
-	EncryptedData   string `json:"encryptedData"`
-	EncryptionNonce string `json:"encryptionNonce"`
-}
-
-type KDF struct {
-	MemLimit int    `json:"memLimit"`
-	OpsLimit int    `json:"opsLimit"`
-	Salt     string `json:"salt"`
-}
-
-func resolvePath(path string) (string, error) {
-	if path[:2] != "~/" {
-		return path, nil
-	}
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return "", err
-	}
-	return home + path[1:], nil
-}
-
-func main() {
-	defer func() {
-		if err := recover(); err != nil {
-			fmt.Println("Error:", err)
-		}
-	}()
-
-	if len(os.Args) != 4 {
-		fmt.Println("Usage: ./decrypt <export_file> <password> <output_file>")
-		return
-	}
-
-	exportFile, err := resolvePath(os.Args[1])
-	if err != nil {
-		fmt.Println("Error resolving exportFile path:", err)
-		return
-	}
-	password := os.Args[2]
-	outputFile, err := resolvePath(os.Args[3])
-	if err != nil {
-		fmt.Println("Error resolving outputFile path:", err)
-		return
-	}
-
-	data, err := os.ReadFile(exportFile)
-	if err != nil {
-		fmt.Println("Error reading file:", err)
-		return
-	}
-
-	var export Export
-	if err := json.Unmarshal(data, &export); err != nil {
-		fmt.Println("Error parsing JSON:", err)
-		return
-	}
-
-	if export.Version != 1 {
-		fmt.Println("Unsupported version")
-		return
-	}
-
-	encryptedData, err := base64.StdEncoding.DecodeString(export.EncryptedData)
-	if err != nil {
-		fmt.Println("Error decoding encrypted data:", err)
-		return
-	}
-
-	nonce, err := base64.StdEncoding.DecodeString(export.EncryptionNonce)
-	if err != nil {
-		fmt.Println("Error decoding nonce:", err)
-		return
-	}
-
-	key, err := deriveArgonKey(password, export.KDFParams.Salt, export.KDFParams.MemLimit, export.KDFParams.OpsLimit)
-	if err != nil {
-		fmt.Println("Error deriving key:", err)
-		return
-	}
-
-	decryptedData, err := decryptChaCha20poly13052(encryptedData, key, nonce)
-	if err != nil {
-		fmt.Println("Error decrypting data:", err)
-		return
-	}
-
-	if err := os.WriteFile(outputFile, decryptedData, 0644); err != nil {
-		fmt.Println("Error writing decrypted data to file:", err)
-		return
-	}
-
-	fmt.Printf("Decrypted data written to %s\n", outputFile)
-}
--- a/auth/migration-guides/decrypt/go.mod
+++ b/auth/migration-guides/decrypt/go.mod
@ -1,7 +0,0 @@
-module decrypt
-
-go 1.20
-
-require golang.org/x/crypto v0.11.0
-
-require golang.org/x/sys v0.10.0 // indirect
--- a/auth/migration-guides/decrypt/go.sum
+++ b/auth/migration-guides/decrypt/go.sum
@ -1,4 +0,0 @@
-golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
--- a/auth/migration-guides/decrypt/release.sh
+++ b/auth/migration-guides/decrypt/release.sh
@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Create a "bin" directory if it doesn't exist
-mkdir -p bin
-
-# List of target operating systems
-OS_TARGETS=("windows" "linux" "darwin")
-
-# Corresponding architectures for each OS
-ARCH_TARGETS=("386 amd64" "386 amd64 arm arm64" "amd64 arm64")
-
-# Loop through each OS target
-for index in "${!OS_TARGETS[@]}"
-do
-    OS=${OS_TARGETS[$index]}
-    for ARCH in ${ARCH_TARGETS[$index]}
-    do
-        # Set the GOOS environment variable for the current target OS
-        export GOOS="$OS"
-        export GOARCH="$ARCH"
-
-        # Set the output binary name to "ente-decrypt" for the current OS and architecture
-        BINARY_NAME="ente-decrypt-$OS-$ARCH"
-
-        # Add .exe extension for Windows
-        if [ "$OS" == "windows" ]; then
-            BINARY_NAME="ente-decrypt-$OS-$ARCH.exe"
-        fi
-
-        # Build the binary and place it in the "bin" directory
-        go build -o "bin/$BINARY_NAME" decrypt.go crypt.go stream.go
-
-        # Print a message indicating the build is complete for the current OS and architecture
-        echo "Built for $OS ($ARCH) as bin/$BINARY_NAME"
-    done
-done
-
-# Clean up any environment variables
-unset GOOS
-unset GOARCH
-
-# Print a message indicating the build process is complete
-echo "Build process completed for all platforms and architectures. Binaries are in the 'bin' directory."
--- a/auth/migration-guides/decrypt/stream.go
+++ b/auth/migration-guides/decrypt/stream.go
@ -1,409 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/binary"
-	"errors"
-	"fmt"
-
-	"golang.org/x/crypto/chacha20"
-	"golang.org/x/crypto/chacha20poly1305"
-	"golang.org/x/crypto/poly1305"
-)
-
-// public constants
-const (
-	//TagMessage the most common tag, that doesn't add any information about the nature of the message.
-	TagMessage = 0
-	// TagPush indicates that the message marks the end of a set of messages,
-	// but not the end of the stream. For example, a huge JSON string sent as multiple chunks can use this tag to indicate to the application that the string is complete and that it can be decoded. But the stream itself is not closed, and more data may follow.
-	TagPush = 0x01
-	// TagRekey "forget" the key used to encrypt this message and the previous ones, and derive a new secret key.
-	TagRekey = 0x02
-	// TagFinal indicates that the message marks the end of the stream, and erases the secret key used to encrypt the previous sequence.
-	TagFinal = TagPush | TagRekey
-
-	StreamKeyBytes    = chacha20poly1305.KeySize
-	StreamHeaderBytes = chacha20poly1305.NonceSizeX
-	// XChaCha20Poly1305IetfABYTES links to crypto_secretstream_xchacha20poly1305_ABYTES
-	XChaCha20Poly1305IetfABYTES = 16 + 1
-)
-
-const cryptoCoreHchacha20InputBytes = 16
-
-/* const crypto_secretstream_xchacha20poly1305_INONCEBYTES = 8 */
-const cryptoSecretStreamXchacha20poly1305Counterbytes = 4
-
-var pad0 [16]byte
-
-var invalidKey = errors.New("invalid key")
-var invalidInput = errors.New("invalid input")
-var cryptoFailure = errors.New("crypto failed")
-
-func memZero(b []byte) {
-	for i := range b {
-		b[i] = 0
-	}
-}
-
-func xorBuf(out, in []byte) {
-	for i := range out {
-		out[i] ^= in[i]
-	}
-}
-
-func bufInc(n []byte) {
-	c := 1
-
-	for i := range n {
-		c += int(n[i])
-		n[i] = byte(c)
-		c >>= 8
-	}
-}
-
-// crypto_secretstream_xchacha20poly1305_state
-type streamState struct {
-	k     [StreamKeyBytes]byte
-	nonce [chacha20poly1305.NonceSize]byte
-	pad   [8]byte
-}
-
-func (s *streamState) reset() {
-	for i := range s.nonce {
-		s.nonce[i] = 0
-	}
-	s.nonce[0] = 1
-}
-
-type Encryptor interface {
-	Push(m []byte, tag byte) ([]byte, error)
-}
-
-type Decryptor interface {
-	Pull(m []byte) ([]byte, byte, error)
-}
-
-type encryptor struct {
-	streamState
-}
-
-type decryptor struct {
-	streamState
-}
-
-func NewStreamKey() []byte {
-	k := make([]byte, chacha20poly1305.KeySize)
-	_, _ = rand.Read(k)
-	return k
-}
-
-func NewEncryptor(key []byte) (Encryptor, []byte, error) {
-	if len(key) != StreamKeyBytes {
-		return nil, nil, invalidKey
-	}
-
-	header := make([]byte, StreamHeaderBytes)
-	_, _ = rand.Read(header)
-
-	stream := &encryptor{}
-
-	k, err := chacha20.HChaCha20(key[:], header[:16])
-	if err != nil {
-		//fmt.Printf("error: %v", err)
-		return nil, nil, err
-	}
-	copy(stream.k[:], k)
-	stream.reset()
-
-	for i := range stream.pad {
-		stream.pad[i] = 0
-	}
-
-	for i, b := range header[cryptoCoreHchacha20InputBytes:] {
-		stream.nonce[i+cryptoSecretStreamXchacha20poly1305Counterbytes] = b
-	}
-	// fmt.Printf("stream: %+v\n", stream.streamState)
-
-	return stream, header, nil
-}
-
-func (s *encryptor) Push(plain []byte, tag byte) ([]byte, error) {
-	var err error
-
-	//crypto_onetimeauth_poly1305_state poly1305_state;
-	var poly *poly1305.MAC
-
-	//unsigned char                     block[64U];
-	var block [64]byte
-
-	//unsigned char                     slen[8U];
-	var slen [8]byte
-
-	//unsigned char                    *c;
-	//unsigned char                    *mac;
-	//
-	//if (outlen_p != NULL) {
-	//*outlen_p = 0U;
-	//}
-
-	mlen := len(plain)
-	//if (mlen > crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX) {
-	//sodium_misuse();
-	//}
-
-	out := make([]byte, mlen+XChaCha20Poly1305IetfABYTES)
-
-	chacha, err := chacha20.NewUnauthenticatedCipher(s.k[:], s.nonce[:])
-	if err != nil {
-		return nil, err
-	}
-	//crypto_stream_chacha20_ietf(block, sizeof block, state->nonce, state->k);
-	chacha.XORKeyStream(block[:], block[:])
-
-	//crypto_onetimeauth_poly1305_init(&poly1305_state, block);
-	var poly_init [32]byte
-	copy(poly_init[:], block[:])
-	poly = poly1305.New(&poly_init)
-
-	// TODO add support for add data
-	//sodium_memzero(block, sizeof block);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, ad, adlen);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, _pad0,
-	//(0x10 - adlen) & 0xf);
-
-	//memset(block, 0, sizeof block);
-	//block[0] = tag;
-	memZero(block[:])
-	block[0] = tag
-
-	//
-	//crypto_stream_chacha20_ietf_xor_ic(block, block, sizeof block, state->nonce, 1U, state->k);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, block, sizeof block);
-	//out[0] = block[0];
-	chacha.XORKeyStream(block[:], block[:])
-	_, _ = poly.Write(block[:])
-	out[0] = block[0]
-
-	//
-	//c = out + (sizeof tag);
-	c := out[1:]
-	//crypto_stream_chacha20_ietf_xor_ic(c, m, mlen, state->nonce, 2U, state->k);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, c, mlen);
-	//crypto_onetimeauth_poly1305_update (&poly1305_state, _pad0, (0x10 - (sizeof block) + mlen) & 0xf);
-	chacha.XORKeyStream(c, plain)
-	_, _ = poly.Write(c[:mlen])
-	padlen := (0x10 - len(block) + mlen) & 0xf
-	_, _ = poly.Write(pad0[:padlen])
-
-	//
-	//STORE64_LE(slen, (uint64_t) adlen);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-	binary.LittleEndian.PutUint64(slen[:], uint64(0))
-	_, _ = poly.Write(slen[:])
-
-	//STORE64_LE(slen, (sizeof block) + mlen);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-	binary.LittleEndian.PutUint64(slen[:], uint64(len(block)+mlen))
-	_, _ = poly.Write(slen[:])
-
-	//
-	//mac = c + mlen;
-	//crypto_onetimeauth_poly1305_final(&poly1305_state, mac);
-	mac := c[mlen:]
-	copy(mac, poly.Sum(nil))
-	//sodium_memzero(&poly1305_state, sizeof poly1305_state);
-	//
-
-	//XOR_BUF(STATE_INONCE(state), mac, crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-	//sodium_increment(STATE_COUNTER(state), crypto_secretstream_xchacha20poly1305_COUNTERBYTES);
-	xorBuf(s.nonce[cryptoSecretStreamXchacha20poly1305Counterbytes:], mac)
-	bufInc(s.nonce[:cryptoSecretStreamXchacha20poly1305Counterbytes])
-
-	// TODO
-	//if ((tag & crypto_secretstream_xchacha20poly1305_TAG_REKEY) != 0 ||
-	//sodium_is_zero(STATE_COUNTER(state),
-	//crypto_secretstream_xchacha20poly1305_COUNTERBYTES)) {
-	//crypto_secretstream_xchacha20poly1305_rekey(state);
-	//}
-
-	//if (outlen_p != NULL) {
-	//*outlen_p = crypto_secretstream_xchacha20poly1305_ABYTES + mlen;
-	//}
-
-	//return 0;
-	return out, nil
-}
-
-func NewDecryptor(key, header []byte) (Decryptor, error) {
-	stream := &decryptor{}
-
-	//crypto_core_hchacha20(state->k, in, k, NULL);
-	k, err := chacha20.HChaCha20(key, header[:16])
-	if err != nil {
-		fmt.Printf("error: %v", err)
-		return nil, err
-	}
-	copy(stream.k[:], k)
-
-	//_crypto_secretstream_xchacha20poly1305_counter_reset(state);
-	stream.reset()
-
-	//memcpy(STATE_INONCE(state), in + crypto_core_hchacha20_INPUTBYTES,
-	//	crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-	copy(stream.nonce[cryptoSecretStreamXchacha20poly1305Counterbytes:],
-		header[cryptoCoreHchacha20InputBytes:])
-
-	//memset(state->_pad, 0, sizeof state->_pad);
-	copy(stream.pad[:], pad0[:])
-
-	//fmt.Printf("decryptor: %+v\n", stream.streamState)
-
-	return stream, nil
-}
-
-func (s *decryptor) Pull(cipher []byte) ([]byte, byte, error) {
-	cipherLen := len(cipher)
-
-	//crypto_onetimeauth_poly1305_state poly1305_state;
-	var poly1305State [32]byte
-
-	//unsigned char                     block[64U];
-	var block [64]byte
-	//unsigned char                     slen[8U];
-	var slen [8]byte
-
-	//unsigned char                     mac[crypto_onetimeauth_poly1305_BYTES];
-	//const unsigned char              *c;
-	//const unsigned char              *stored_mac;
-	//unsigned long long                mlen; // length of the returned message
-	//unsigned char                     tag; // for the return value
-	//
-	//if (mlen_p != NULL) {
-	//*mlen_p = 0U;
-	//}
-	//if (tag_p != NULL) {
-	//*tag_p = 0xff;
-	//}
-
-	/*
-		if (inlen < crypto_secretstream_xchacha20poly1305_ABYTES) {
-		return -1;
-		}
-		mlen = inlen - crypto_secretstream_xchacha20poly1305_ABYTES;
-	*/
-	if cipherLen < XChaCha20Poly1305IetfABYTES {
-		return nil, 0, invalidInput
-	}
-	mlen := cipherLen - XChaCha20Poly1305IetfABYTES
-
-	//if (mlen > crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX) {
-	//sodium_misuse();
-	//}
-
-	//crypto_stream_chacha20_ietf(block, sizeof block, state->nonce, state->k);
-	chacha, err := chacha20.NewUnauthenticatedCipher(s.k[:], s.nonce[:])
-	if err != nil {
-		return nil, 0, err
-	}
-	chacha.XORKeyStream(block[:], block[:])
-
-	//crypto_onetimeauth_poly1305_init(&poly1305_state, block);
-
-	copy(poly1305State[:], block[:])
-	poly := poly1305.New(&poly1305State)
-
-	// TODO
-	//sodium_memzero(block, sizeof block);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, ad, adlen);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, _pad0,
-	//(0x10 - adlen) & 0xf);
-	//
-
-	//memset(block, 0, sizeof block);
-	//block[0] = in[0];
-	//crypto_stream_chacha20_ietf_xor_ic(block, block, sizeof block, state->nonce, 1U, state->k);
-	memZero(block[:])
-	block[0] = cipher[0]
-	chacha.XORKeyStream(block[:], block[:])
-
-	//tag = block[0];
-	//block[0] = in[0];
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, block, sizeof block);
-	tag := block[0]
-	block[0] = cipher[0]
-	if _, err = poly.Write(block[:]); err != nil {
-		return nil, 0, err
-	}
-
-	//c = in + (sizeof tag);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, c, mlen);
-	//crypto_onetimeauth_poly1305_update (&poly1305_state, _pad0, (0x10 - (sizeof block) + mlen) & 0xf);
-	c := cipher[1:]
-	if _, err = poly.Write(c[:mlen]); err != nil {
-		return nil, 0, err
-	}
-	padLen := (0x10 - len(block) + mlen) & 0xf
-	if _, err = poly.Write(pad0[:padLen]); err != nil {
-		return nil, 0, err
-	}
-
-	//
-	//STORE64_LE(slen, (uint64_t) adlen);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-	binary.LittleEndian.PutUint64(slen[:], uint64(0))
-	if _, err = poly.Write(slen[:]); err != nil {
-		return nil, 0, err
-	}
-
-	//STORE64_LE(slen, (sizeof block) + mlen);
-	//crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-	binary.LittleEndian.PutUint64(slen[:], uint64(len(block)+mlen))
-	if _, err = poly.Write(slen[:]); err != nil {
-		return nil, 0, err
-	}
-
-	//
-	//crypto_onetimeauth_poly1305_final(&poly1305_state, mac);
-	//sodium_memzero(&poly1305_state, sizeof poly1305_state);
-
-	mac := poly.Sum(nil)
-	memZero(poly1305State[:])
-
-	//stored_mac = c + mlen;
-	//if (sodium_memcmp(mac, stored_mac, sizeof mac) != 0) {
-	//sodium_memzero(mac, sizeof mac);
-	//return -1;
-	//}
-	storedMac := c[mlen:]
-	if !bytes.Equal(mac, storedMac) {
-		memZero(mac)
-		return nil, 0, cryptoFailure
-	}
-
-	//crypto_stream_chacha20_ietf_xor_ic(m, c, mlen, state->nonce, 2U, state->k);
-	//XOR_BUF(STATE_INONCE(state), mac, crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-	//sodium_increment(STATE_COUNTER(state), crypto_secretstream_xchacha20poly1305_COUNTERBYTES);
-	m := make([]byte, mlen)
-	chacha.XORKeyStream(m, c[:mlen])
-
-	xorBuf(s.nonce[cryptoSecretStreamXchacha20poly1305Counterbytes:], mac)
-	bufInc(s.nonce[:cryptoSecretStreamXchacha20poly1305Counterbytes])
-
-	// TODO
-	//if ((tag & crypto_secretstream_xchacha20poly1305_TAG_REKEY) != 0 ||
-	//sodium_is_zero(STATE_COUNTER(state),
-	//crypto_secretstream_xchacha20poly1305_COUNTERBYTES)) {
-	//crypto_secretstream_xchacha20poly1305_rekey(state);
-	//}
-
-	//if (mlen_p != NULL) {
-	//*mlen_p = mlen;
-	//}
-	//if (tag_p != NULL) {
-	//*tag_p = tag;
-	//}
-	//return 0;
-	return m, tag, nil
-}
--- a/auth/migration-guides/encrypted_export.md
+++ b/auth/migration-guides/encrypted_export.md
@ -53,11 +53,11 @@ For encryption, we are using `XChaCha20-Poly1305` algorithm.

 ## How to use the exported data

-* **ente Authenticator app**: You can directly import the codes in the ente Authenticator app.
+* **Ente Authenticator app**: You can directly import the codes in the Ente Authenticator app.
  > Settings -> Data -> Import Codes -> ente Encrypted export.

-* **Decryption Tool** : You can download the prebuilt [decryption tool](decrypt/bin/) (or build it from [source](decrypt)) and run the following command.
+* **Decrypt using Ente CLI** : Download the latest version of [Ente CLI](https://github.com/ente-io/ente/releases?q=CLI&expanded=false), and run the following command
         
 ```
-  ./decrypt <export_file> <password> <output_file>
+  ./ente auth decrypt <export_file> <output_file>
 ```
--- a/auth/pubspec.lock
+++ b/auth/pubspec.lock
@ -197,10 +197,10 @@ packages:
    dependency: "direct main"
    description:
      name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
  computer:
    dependency: "direct main"
    description:
@ -262,10 +262,10 @@ packages:
    dependency: transitive
    description:
      name: coverage
-      sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
+      sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
      url: "https://pub.dev"
    source: hosted
-    version: "1.6.3"
+    version: "1.7.2"
  cross_file:
    dependency: transitive
    description:
@ -751,6 +751,30 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "6.6.2"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
  lints:
    dependency: "direct dev"
    description:
@ -811,26 +835,26 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
  meta:
    dependency: transitive
    description:
      name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
      url: "https://pub.dev"
    source: hosted
-    version: "1.9.1"
+    version: "1.11.0"
  mime:
    dependency: transitive
    description:
@ -931,10 +955,10 @@ packages:
    dependency: transitive
    description:
      name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
  path_drawing:
    dependency: transitive
    description:
@ -1304,10 +1328,10 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
  step_progress_indicator:
    dependency: "direct main"
    description:
@ -1320,10 +1344,10 @@ packages:
    dependency: transitive
    description:
      name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
  stream_transform:
    dependency: transitive
    description:
@ -1368,26 +1392,26 @@ packages:
    dependency: transitive
    description:
      name: test
-      sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46"
+      sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
      url: "https://pub.dev"
    source: hosted
-    version: "1.24.3"
+    version: "1.24.9"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
  test_core:
    dependency: transitive
    description:
      name: test_core
-      sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e"
+      sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.3"
+    version: "0.5.9"
  timezone:
    dependency: transitive
    description:
@ -1560,10 +1584,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
      url: "https://pub.dev"
    source: hosted
-    version: "9.4.0"
+    version: "13.0.0"
  watcher:
    dependency: transitive
    description:
@ -1572,14 +1596,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.2"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.4-beta"
  web_socket_channel:
    dependency: transitive
    description:
@ -1637,5 +1653,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=3.1.0-185.0.dev <4.0.0"
+  dart: ">=3.2.0-0 <4.0.0"
  flutter: ">=3.10.0"
--- a/cli/.github/workflows/release.yml
+++ b/cli/.github/workflows/release.yml
@ -1,36 +0,0 @@
-name: Release
-
-on:
-  # allow manual run
-  push:
-    tags:
-      - 'v*.*.*'  # This will run the workflow when you push a new tag in the format v0.0.0
-      - 'v*.*.*-beta.*'
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install latest Syft
-        run: |
-          wget $(curl -s https://api.github.com/repos/anchore/syft/releases/latest | grep 'browser_' | grep 'linux_amd64.rpm' | cut -d\" -f4) -O syft_latest_linux_amd64.rpm
-          sudo rpm -i syft_latest_linux_amd64.rpm
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Important to ensure that GoReleaser works correctly
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.20'  # You can adjust the Go version here
-
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          distribution: goreleaser
-          version: latest
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Use the provided GITHUB_TOKEN secret
--- a/cli/.goreleaser.yaml
+++ b/cli/.goreleaser.yaml
@ -1,58 +0,0 @@
-# This is an example .goreleaser.yml file with some sensible defaults.
-# Make sure to check the documentation at https://goreleaser.com
-
-# The lines bellow are called `modelines`. See `:help modeline`
-# Feel free to remove those if you don't want/need to use them.
-# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
-# vim: set ts=2 sw=2 tw=0 fo=cnqoj
-project_name: ente
-before:
-  hooks:
-    # You may remove this if you don't use go modules.
-    - go mod tidy
-    # you may remove this if you don't need go generate
-    - go generate ./...
-
-builds:
-  - env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - windows
-      - darwin
-
-nfpms:
-  - package_name: ente
-    homepage: https://github.com/ente-io/cli
-    maintainer: ente.io <engineering@ente.io>
-    description: |-
-      Command Line Utility for exporting data from https://ente.io
-    formats:
-      - rpm
-      - deb
-      - apk
-
-sboms:
-  - artifacts: archive
-
-archives:
-  - format: tar.gz
-    # this name template makes the OS and Arch compatible with the results of `uname`.
-    name_template: >-
-      {{ .ProjectName }}_
-      {{- title .Os }}_
-      {{- if eq .Arch "amd64" }}x86_64
-      {{- else if eq .Arch "386" }}i386
-      {{- else }}{{ .Arch }}{{ end }}
-      {{- if .Arm }}v{{ .Arm }}{{ end }}
-    # use zip for windows archives
-    format_overrides:
-      - goos: windows
-        format: zip
-
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - "^docs:"
-      - "^test:"
--- a/cli/README.md
+++ b/cli/README.md
@ -2,7 +2,9 @@

 ## Install

-You can either download the binary from the [release page](https://github.com/ente-io/cli/releases) or build it yourself.
+You can either download the binary from the [GitHub releases
+page](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0&expanded=true) or
+build it yourself.

 ### Build from source

@ -29,10 +31,10 @@ ente account add
 ```shell
 ente account list
 ```
-  
+
 ##### Change export directory
 ```shell
-ente account update --email email@domain.com --dir ~/photos 
+ente account update --email email@domain.com --dir ~/photos
 ```

 ### Export
@ -58,7 +60,7 @@ docker build -t ente:latest .
 ```

 Start the container in detached mode
-```bash 
+```bash
 docker-compose up -d
 ```

@ -66,12 +68,12 @@ docker-compose up -d
 ```shell
 docker-compose exec ente /bin/sh
 ```
-  
-    
+
+
 #### Directly executing commands

 ```shell
-docker run -it --rm ente:latest ls 
+docker run -it --rm ente:latest ls
 ```

 ---
--- a/cli/cmd/authenticator.go
+++ b/cli/cmd/authenticator.go
@ -0,0 +1,29 @@
+package cmd
+
+import (
+	"github.com/ente-io/cli/pkg/authenticator"
+	"github.com/spf13/cobra"
+)
+
+// Define the 'config' command and its subcommands
+var authenticatorCmd = &cobra.Command{
+	Use:   "auth",
+	Short: "Authenticator commands",
+}
+
+// Subcommand for 'config update'
+var decryptExportCmd = &cobra.Command{
+	Use:   "decrypt [input] [output]",
+	Short: "Decrypt authenticator export",
+	Args:  cobra.ExactArgs(2), // Ensures exactly two arguments are passed
+	RunE: func(cmd *cobra.Command, args []string) error {
+		inputPath := args[0]
+		outputPath := args[1]
+		return authenticator.DecryptExport(inputPath, outputPath)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(authenticatorCmd)
+	authenticatorCmd.AddCommand(decryptExportCmd)
+}
--- a/cli/cmd/root.go
+++ b/cli/cmd/root.go
@ -11,7 +11,7 @@ import (
 	"github.com/spf13/cobra"
 )

-const AppVersion = "0.1.10"
+const AppVersion = "0.1.11"

 var ctrl *pkg.ClICtrl

--- a/cli/config.yaml
+++ b/cli/config.yaml
--- a/cli/pkg/authenticator/decrypt.go
+++ b/cli/pkg/authenticator/decrypt.go
@ -0,0 +1,71 @@
+package authenticator
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/ente-io/cli/internal"
+	eCrypto "github.com/ente-io/cli/internal/crypto"
+	"os"
+)
+
+type _Export struct {
+	Version         int    `json:"version"`
+	KDFParams       _KDF   `json:"kdfParams"`
+	EncryptedData   string `json:"encryptedData"`
+	EncryptionNonce string `json:"encryptionNonce"`
+}
+
+type _KDF struct {
+	MemLimit int    `json:"memLimit"`
+	OpsLimit int    `json:"opsLimit"`
+	Salt     string `json:"salt"`
+}
+
+func DecryptExport(inputPath string, outputPath string) error {
+	exportFile, err := internal.ResolvePath(inputPath)
+	if err != nil {
+		return fmt.Errorf("error resolving exportFile path (in): %v", err)
+	}
+	outputFile, err := internal.ResolvePath(outputPath)
+	if err != nil {
+		return fmt.Errorf("error resolving outputFile path (out): %v", err)
+	} // Implement your decryption logic here
+
+	data, err := os.ReadFile(exportFile)
+	if err != nil {
+		return fmt.Errorf("error reading file: %v", err)
+	}
+
+	var export _Export
+	if err := json.Unmarshal(data, &export); err != nil {
+		return fmt.Errorf("error parsing JSON: %v", err)
+	}
+
+	if export.Version != 1 {
+		return fmt.Errorf("unsupported export version: %d", export.Version)
+	}
+
+	password, err := internal.GetSensitiveField("Enter password to decrypt export")
+	if err != nil {
+		return err
+	}
+	fmt.Printf("\n....")
+	key, err := eCrypto.DeriveArgonKey(password, export.KDFParams.Salt, export.KDFParams.MemLimit, export.KDFParams.OpsLimit)
+	if err != nil {
+		return fmt.Errorf("error deriving key: %v", err)
+	}
+
+	_, decryptedData, err := eCrypto.DecryptChaChaBase64(export.EncryptedData, key, export.EncryptionNonce)
+	if err != nil {
+		fmt.Printf("\nerror decrypting data %v", err)
+		fmt.Println("\nPlease check your password and try again")
+		return nil
+	}
+
+	if err := os.WriteFile(outputFile, decryptedData, 0644); err != nil {
+		return fmt.Errorf("error writing file: %v", err)
+	}
+
+	fmt.Printf("\nExport decrypted successfully to %s\n", outputFile)
+	return nil
+}
--- a/desktop/.github/pull_request_template.md
+++ b/desktop/.github/pull_request_template.md
@ -1,3 +0,0 @@
-## Description
-
-## Test Plan
--- a/desktop/LICENSE
+++ b/desktop/LICENSE
@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/desktop/README.md
+++ b/desktop/README.md
@ -1,60 +1,41 @@
-# ente Photos - Desktop
+## Desktop app for Ente Photos

-Desktop app for [ente.io](https://ente.io) build with [electron](https://electronjs.org) and loads of ❤️.
+The sweetness of Ente Photos, right on your computer. Linux, Windows and macOS.
+
+You can [**download** a pre-built binary from
+releases](https://github.com/ente-io/photos-desktop/releases/latest).
+
+To know more about Ente, see [our main README](../README.md) or visit
+[ente.io](https://ente.io).
+
+## Building from source

 > [!CAUTION]
 >
 > We moved a few things around when switching to a monorepo recently, so this
 > folder might not build with the instructions below. Hang tight, we're on it,
-> will fix things.
+> will fix things if.

-## Disclaimer
+Fetch submodules

-We are aware that electron is a sub-optimal choice for building desktop applications.
-
-The goal of this app was to
-1. provide a stable environment for customers to back up large amounts of data reliably
-2. export uploaded data from our servers to their local hard drives.
-
-Electron was the best way to reuse our battle tested code from [photos-web](https://github.com/ente-io/photos-web) that powers [web.ente.io](https://web.ente.io).
-
-As an archival solution built by a small team, we are hopeful that this project will help us keep our stack lean, while ensuring a painfree life for our customers.
-
-If you are running into issues with this app, please drop a mail to [support@ente.io](mailto:support@ente.io) and we'll be very happy to help.
-
-## Download
-
- [Latest Release](https://github.com/ente-io/photos-desktop/releases/latest)
-
-
-## Building from source
-
-You'll need to have node (and yarn) installed on your machine. e.g. on macOS you
-can do `brew install node`. After that, you can run the following commands to
-fetch and build from source.
-
-```bash
-# Clone this repository
-git clone https://github.com/ente-io/photos-desktop
-
-# Go into the repository
-cd photos-desktop
-
-# Clone submodules (recursively)
+```sh
 git submodule update --init --recursive
+```

-# Install packages
-yarn
+Install dependencies

-# Run the app
+```sh
+yarn install
+```
+
+Run the app
+
+```sh
 yarn start
 ```

-### Re-compile automatically
-
-To recompile automatically and to allow using
-[electron-reload](https://github.com/yan-foto/electron-reload), run this in a
-separate terminal:
+To recompile automatically using electron-reload, run this in a separate
+terminal:

 ```bash
 yarn watch
--- a/desktop/SECURITY.md
+++ b/desktop/SECURITY.md
@ -1,44 +0,0 @@
-ente believes that working with security researchers across the globe is crucial to keeping our
-users safe. If you believe you've found a security issue in our product or service, we encourage you to
-notify us (security@ente.io). We welcome working with you to resolve the issue promptly. Thanks in advance!
-
-# Disclosure Policy
-
- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every
-  effort to quickly resolve the issue.
- Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a
-  third-party. We may publicly disclose the issue before resolving it, if appropriate. 
- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or
-  degradation of our service. Only interact with accounts you own or with explicit permission of the
-  account holder.
- If you would like to encrypt your report, please use the PGP key with long ID
-  `E273695C0403F34F74171932DF6DDDE98EBD2394` (available in the public keyserver pool).
-
-# In-scope
-
- Security issues in any current release of ente. This includes the web app, desktop app,
-  and mobile apps (iOS and Android). Product downloads are available at https://ente.io. Source
-  code is available at https://github.com/ente-io.
-
-# Exclusions
-
-The following bug classes are out-of scope:
-
- Bugs that are already reported on any of ente's issue trackers (https://github.com/ente-io),
-  or that we already know of. Note that some of our issue tracking is private.
- Issues in an upstream software dependency (ex: Flutter, Next.js etc) which are already reported to the upstream maintainer.
- Attacks requiring physical access to a user's device.
- Self-XSS
- Issues related to software or protocols not under ente's control
- Vulnerabilities in outdated versions of ente
- Missing security best practices that do not directly lead to a vulnerability
- Issues that do not have any impact on the general public
-
-While researching, we'd like to ask you to refrain from:
-
- Denial of service
- Spamming
- Social engineering (including phishing) of ente staff or contractors
- Any physical attempts against ente property or data centers
-
-Thank you for helping keep ente and our users safe!
--- a/desktop/src/utils/menu.ts
+++ b/desktop/src/utils/menu.ts
@ -64,7 +64,7 @@ export async function buildMenuBar(mainWindow: BrowserWindow): Promise<Menu> {
                    label: 'View Changelog',
                    click: () => {
                        shell.openExternal(
-                            'https://github.com/ente-io/photos-desktop/blob/main/CHANGELOG.md'
+                            'https://github.com/ente-io/ente/blob/main/desktop/CHANGELOG.md'
                        );
                    },
                },
--- a/mobile/.github/workflows/build.yml
+++ b/mobile/.github/workflows/build.yml
@ -1,65 +0,0 @@
-name: Manual build
-
-on:
-  workflow_dispatch: # Enable manual run only
-
-jobs:
-  build:
-    # This job will run on ubuntu virtual machine
-    runs-on: ubuntu-latest
-    steps:
-
-      # Setup Java environment in order to build the Android app.
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-
-      # Setup the flutter environment.
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: '3.13.4'
-
-      # Fetch sub modules
-      - run: git submodule update --init --recursive
-
-      # Get flutter dependencies.
-      - run: flutter pub get
-
-      - name: Setup keys
-        uses: timheuer/base64-to-file@v1
-        with:
-          fileName: 'keystore/ente_photos_key.jks'
-          encodedString: ${{ secrets.SIGNING_KEY }}
-
-      # Build independent apk.
-      - name: Build
-        run: flutter build apk --release --flavor independent && mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente.apk
-        env:
-          SIGNING_KEY_PATH: '/home/runner/work/_temp/keystore/ente_photos_key.jks'
-          SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-          SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-
-      - name: Checksum
-        run: sha256sum build/app/outputs/flutter-apk/ente.apk > build/app/outputs/flutter-apk/sha256sum
-
-      # Upload generated apk to the artifacts.
-      - uses: actions/upload-artifact@v4
-        with:
-          name: release-apk
-          path: build/app/outputs/flutter-apk/ente.apk
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: release-checksum
-          path: build/app/outputs/flutter-apk/sha256sum
-
-      # Create a pre-release
-      - uses: ncipollo/release-action@v1.14.0
-        with:
-          artifacts: "build/app/outputs/flutter-apk/ente.apk,build/app/outputs/flutter-apk/sha256sum"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          prerelease: true
--- a/mobile/.github/workflows/code_quality.yml
+++ b/mobile/.github/workflows/code_quality.yml
@ -1,33 +0,0 @@
-name: Check Linter Rules
-on:
-  pull_request:
-    types: [review_requested]
-    branches:
-      - master
-jobs:
-  test:
-    name: Check the source code
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v2
-        with:
-          path: ${{ runner.tool_cache }}/flutter
-          key: flutter-3.0.0-stable
-      # Setup the flutter environment.
-      - uses: subosito/flutter-action@v2.3.0
-        with:
-          channel: 'stable'
-          flutter-version: '3.0.0'
-
-      # Fetch sub modules
-      - run: git submodule update --init --recursive
-
-      # Get flutter dependencies.
-      - name: Install packages
-        run: flutter pub get
-
-      - name: Run Linter
-        run: flutter analyze --no-fatal-infos
-      - name: Run Test
-        run: flutter test
--- a/mobile/.github/workflows/crowdin.yml
+++ b/mobile/.github/workflows/crowdin.yml
@ -1,36 +0,0 @@
-name: Sync crowdin translation
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - 'lib/l10n/intl_en.arb'
-    branches: [ main ]
-  schedule:
-    - cron: '0 */12 * * *' # Every 12 hours - https://crontab.guru/#0_*/12_*_*_*
-
-jobs:
-  synchronize-with-crowdin:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: crowdin action
-        uses: crowdin/github-action@v1
-        with:
-          upload_sources: true
-          upload_translations: true
-          download_translations: true
-          localization_branch_name: l10n_translations
-          create_pull_request: true
-          skip_untranslated_strings: true
-          pull_request_title: 'New  Translations'
-          pull_request_body: 'New translations via [Crowdin GH Action](https://github.com/crowdin/github-action)'
-          pull_request_base_branch_name: 'main'
-          pull_request_reviewers: ashilkn,vishnukvmd,ua741
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/mobile/.github/workflows/release.yml
+++ b/mobile/.github/workflows/release.yml
@ -1,70 +0,0 @@
-name: Release
-
-# This workflow is triggered on pushes to the repository.
-on:
-  workflow_dispatch:
-    # Enable manual run
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - 'v*' # Push events to matching v*, i.e. v4.2.0
-
-jobs:
-  build:
-    # This job will run on ubuntu virtual machine
-    runs-on: ubuntu-latest
-    steps:
-
-      # Setup Java environment in order to build the Android app.
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-
-      # Setup the flutter environment.
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: '3.13.4'
-
-      # Fetch sub modules
-      - run: git submodule update --init --recursive
-
-      # Get flutter dependencies.
-      - run: flutter pub get
-
-      - name: Setup keys
-        uses: timheuer/base64-to-file@v1
-        with:
-          fileName: 'keystore/ente_photos_key.jks'
-          encodedString: ${{ secrets.SIGNING_KEY }}
-
-      # Build independent apk.
-      - name: Build
-        run: flutter build apk --release --flavor independent && mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente.apk
-        env:
-          SIGNING_KEY_PATH: '/home/runner/work/_temp/keystore/ente_photos_key.jks'
-          SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-          SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-
-      - name: Checksum
-        run: sha256sum build/app/outputs/flutter-apk/ente.apk > build/app/outputs/flutter-apk/sha256sum
-
-      # Upload generated apk to the artifacts.
-      - uses: actions/upload-artifact@v2
-        with:
-          name: release-apk
-          path: build/app/outputs/flutter-apk/ente.apk
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: release-checksum
-          path: build/app/outputs/flutter-apk/checksum
-
-      # Create a Github release
-      - uses: ncipollo/release-action@v1
-        with:
-          artifacts: "build/app/outputs/flutter-apk/ente.apk,build/app/outputs/flutter-apk/sha256sum"
-          token: ${{ secrets.GITHUB_TOKEN }}
--- a/mobile/crowdin.yml
+++ b/mobile/crowdin.yml
@ -1,4 +1,3 @@
-project_id_env: CROWDIN_PROJECT_ID
 api_token_env: CROWDIN_PERSONAL_TOKEN
 preserve_hierarchy: true

--- a/mobile/lib/core/configuration.dart
+++ b/mobile/lib/core/configuration.dart
@ -580,10 +580,14 @@ class Configuration {
    return _preferences.setBool(keyShouldShowLockScreen, value);
  }

-  void setVolatilePassword(String? volatilePassword) {
+  void setVolatilePassword(String volatilePassword) {
    _volatilePassword = volatilePassword;
  }

+  void resetVolatilePassword() {
+    _volatilePassword = null;
+  }
+
  String? getVolatilePassword() {
    return _volatilePassword;
  }
--- a/mobile/lib/core/constants.dart
+++ b/mobile/lib/core/constants.dart
@ -8,7 +8,8 @@ const String sentryDSN =
 const String sentryDebugDSN =
    "https://ca5e686dd7f149d9bf94e620564cceba@sentry.ente.io/3";
 const String sentryTunnel = "https://sentry-reporter.ente.io";
-const String githubIssuesUrl = "https://github.com/ente-io/photos-app/issues";
+const String githubDiscussionsUrl =
+    "https://github.com/ente-io/ente/discussions";
 const int microSecondsInDay = 86400000000;
 const int android11SDKINT = 30;
 const int jan011981Time = 347155200000000;
@ -41,6 +42,7 @@ const supportEmail = 'support@ente.io';
 class FFDefault {
  static const bool enableStripe = true;
  static const bool disableCFWorker = false;
+  static const bool enablePasskey = false;
 }

 const kDefaultProductionEndpoint = 'https://api.ente.io';
--- a/mobile/lib/generated/intl/messages_en.dart
+++ b/mobile/lib/generated/intl/messages_en.dart
@ -797,6 +797,8 @@ class MessageLookup extends MessageLookupByLibrary {
            "Kindly help us with this information"),
        "language": MessageLookupByLibrary.simpleMessage("Language"),
        "lastUpdated": MessageLookupByLibrary.simpleMessage("Last updated"),
+        "launchPasskeyUrlAgain":
+            MessageLookupByLibrary.simpleMessage("Launch passkey URL again"),
        "leave": MessageLookupByLibrary.simpleMessage("Leave"),
        "leaveAlbum": MessageLookupByLibrary.simpleMessage("Leave album"),
        "leaveFamily": MessageLookupByLibrary.simpleMessage("Leave family"),
@ -954,6 +956,9 @@ class MessageLookup extends MessageLookupByLibrary {
        "orPickAnExistingOne":
            MessageLookupByLibrary.simpleMessage("Or pick an existing one"),
        "pair": MessageLookupByLibrary.simpleMessage("Pair"),
+        "passkey": MessageLookupByLibrary.simpleMessage("Passkey"),
+        "passkeyAuthTitle":
+            MessageLookupByLibrary.simpleMessage("Passkey authentication"),
        "password": MessageLookupByLibrary.simpleMessage("Password"),
        "passwordChangedSuccessfully": MessageLookupByLibrary.simpleMessage(
            "Password changed successfully"),
@ -1460,6 +1465,8 @@ class MessageLookup extends MessageLookupByLibrary {
        "viewer": MessageLookupByLibrary.simpleMessage("Viewer"),
        "visitWebToManage": MessageLookupByLibrary.simpleMessage(
            "Please visit web.ente.io to manage your subscription"),
+        "waitingForBrowserRequest": MessageLookupByLibrary.simpleMessage(
+            "Waiting for browser request..."),
        "waitingForWifi":
            MessageLookupByLibrary.simpleMessage("Waiting for WiFi..."),
        "weAreOpenSource":
--- a/mobile/lib/generated/l10n.dart
+++ b/mobile/lib/generated/l10n.dart
@ -8308,6 +8308,46 @@ class S {
    );
  }

+  /// `Waiting for browser request...`
+  String get waitingForBrowserRequest {
+    return Intl.message(
+      'Waiting for browser request...',
+      name: 'waitingForBrowserRequest',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Launch passkey URL again`
+  String get launchPasskeyUrlAgain {
+    return Intl.message(
+      'Launch passkey URL again',
+      name: 'launchPasskeyUrlAgain',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Passkey`
+  String get passkey {
+    return Intl.message(
+      'Passkey',
+      name: 'passkey',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Passkey authentication`
+  String get passkeyAuthTitle {
+    return Intl.message(
+      'Passkey authentication',
+      name: 'passkeyAuthTitle',
+      desc: '',
+      args: [],
+    );
+  }
+
  /// `Play album on TV`
  String get playOnTv {
    return Intl.message(
--- a/mobile/lib/l10n/intl_en.arb
+++ b/mobile/lib/l10n/intl_en.arb
@ -1188,6 +1188,10 @@
  "changeLocationOfSelectedItems": "Change location of selected items?",
  "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente",
  "cleanUncategorized": "Clean Uncategorized",
+  "waitingForBrowserRequest": "Waiting for browser request...",
+  "launchPasskeyUrlAgain": "Launch passkey URL again",
+  "passkey": "Passkey",
+  "passkeyAuthTitle": "Passkey authentication",
  "playOnTv": "Play album on TV",
  "pair": "Pair",
  "deviceNotFound": "Device not found",
--- a/mobile/lib/l10n/intl_pt.arb
+++ b/mobile/lib/l10n/intl_pt.arb
@ -236,7 +236,7 @@
  "publicLinkEnabled": "Link público ativado",
  "shareALink": "Compartilhar link",
  "sharedAlbumSectionDescription": "Criar álbuns compartilhados e colaborativos com outros usuários Ente, incluindo usuários em planos gratuitos.",
-  "shareWithPeopleSectionTitle": "{numberOfPeople, plural, one {}=0 {Compartilhe com pessoas específicas} =1 {Compartilhado com 1 pessoa} other {Compartilhado com {numberOfPeople} pessoas}}",
+  "shareWithPeopleSectionTitle": "{numberOfPeople, plural, =0 {Compartilhe com pessoas específicas} =1 {Compartilhado com 1 pessoa} other {Compartilhado com {numberOfPeople} pessoas}}",
  "@shareWithPeopleSectionTitle": {
    "placeholders": {
      "numberOfPeople": {
--- a/mobile/lib/services/feature_flag_service.dart
+++ b/mobile/lib/services/feature_flag_service.dart
@ -68,6 +68,18 @@ class FeatureFlagService {
    }
  }

+  bool enablePasskey() {
+    try {
+      if (isInternalUserOrDebugBuild()) {
+        return true;
+      }
+      return _getFeatureFlags().enablePasskey;
+    } catch (e) {
+      _logger.info('error in enablePasskey check', e);
+      return FFDefault.enablePasskey;
+    }
+  }
+
  bool isInternalUserOrDebugBuild() {
    final String? email = Configuration.instance.getEmail();
    final userID = Configuration.instance.getUserID();
@ -94,20 +106,24 @@ class FeatureFlags {
  static FeatureFlags defaultFlags = FeatureFlags(
    disableCFWorker: FFDefault.disableCFWorker,
    enableStripe: FFDefault.enableStripe,
+    enablePasskey: FFDefault.enablePasskey,
  );

  final bool disableCFWorker;
  final bool enableStripe;
+  final bool enablePasskey;

  FeatureFlags({
    required this.disableCFWorker,
    required this.enableStripe,
+    required this.enablePasskey,
  });

  Map<String, dynamic> toMap() {
    return {
      "disableCFWorker": disableCFWorker,
      "enableStripe": enableStripe,
+      "enablePasskey": enablePasskey,
    };
  }

@ -120,6 +136,7 @@ class FeatureFlags {
    return FeatureFlags(
      disableCFWorker: json["disableCFWorker"] ?? FFDefault.disableCFWorker,
      enableStripe: json["enableStripe"] ?? FFDefault.enableStripe,
+      enablePasskey: json["enablePasskey"] ?? FFDefault.enablePasskey,
    );
  }
 }
--- a/mobile/lib/services/passkey_service.dart
+++ b/mobile/lib/services/passkey_service.dart
@ -0,0 +1,33 @@
+import "package:flutter/cupertino.dart";
+import "package:logging/logging.dart";
+import "package:photos/core/network/network.dart";
+import "package:photos/utils/dialog_util.dart";
+import 'package:url_launcher/url_launcher_string.dart';
+
+class PasskeyService {
+  PasskeyService._privateConstructor();
+  static final PasskeyService instance = PasskeyService._privateConstructor();
+
+  final _enteDio = NetworkClient.instance.enteDio;
+
+  Future<String> getJwtToken() async {
+    final response = await _enteDio.get(
+      "/users/accounts-token",
+    );
+    return response.data!["accountsToken"] as String;
+  }
+
+  Future<void> openPasskeyPage(BuildContext context) async {
+    try {
+      final jwtToken = await getJwtToken();
+      final url = "https://accounts.ente.io/account-handoff?token=$jwtToken";
+      await launchUrlString(
+        url,
+        mode: LaunchMode.externalApplication,
+      );
+    } catch (e) {
+      Logger('PasskeyService').severe("failed to open passkey page", e);
+      showGenericErrorDialog(context: context, error: e).ignore();
+    }
+  }
+}
--- a/mobile/lib/services/user_service.dart
+++ b/mobile/lib/services/user_service.dart
@ -28,6 +28,7 @@ import 'package:photos/models/set_recovery_key_request.dart';
 import 'package:photos/models/user_details.dart';
 import 'package:photos/ui/account/login_page.dart';
 import 'package:photos/ui/account/ott_verification_page.dart';
+import "package:photos/ui/account/passkey_page.dart";
 import 'package:photos/ui/account/password_entry_page.dart';
 import 'package:photos/ui/account/password_reentry_page.dart';
 import "package:photos/ui/account/recovery_page.dart";
@ -314,6 +315,25 @@ class UserService {
    }
  }

+  Future<void> onPassKeyVerified(BuildContext context, Map response) async {
+    final userPassword = Configuration.instance.getVolatilePassword();
+    if (userPassword == null) throw Exception("volatile password is null");
+
+    await _saveConfiguration(response);
+
+    if (Configuration.instance.getEncryptedToken() != null) {
+      await Configuration.instance.decryptSecretsAndGetKeyEncKey(
+        userPassword,
+        Configuration.instance.getKeyAttributes()!,
+      );
+    } else {
+      throw Exception("unexpected response during passkey verification");
+    }
+
+    Navigator.of(context).popUntil((route) => route.isFirst);
+    Bus.instance.fire(AccountConfiguredEvent());
+  }
+
  Future<void> verifyEmail(
    BuildContext context,
    String ott, {
@ -648,10 +668,14 @@ class UserService {
    if (response.statusCode == 200) {
      Widget page;
      final String twoFASessionID = response.data["twoFactorSessionID"];
+      final String passkeySessionID = response.data["passkeySessionID"];
+
      Configuration.instance.setVolatilePassword(userPassword);
      if (twoFASessionID.isNotEmpty) {
        await setTwoFactor(value: true);
        page = TwoFactorAuthenticationPage(twoFASessionID);
+      } else if (passkeySessionID.isNotEmpty) {
+        page = PasskeyPage(passkeySessionID);
      } else {
        await _saveConfiguration(response);
        if (Configuration.instance.getEncryptedToken() != null) {
@ -1108,16 +1132,19 @@ class UserService {
    }
  }

-  Future<void> _saveConfiguration(Response response) async {
-    await Configuration.instance.setUserID(response.data["id"]);
-    if (response.data["encryptedToken"] != null) {
+  Future<void> _saveConfiguration(dynamic response) async {
+    final responseData = response is Map ? response : response.data as Map?;
+    if (responseData == null) return;
+
+    await Configuration.instance.setUserID(responseData["id"]);
+    if (responseData["encryptedToken"] != null) {
      await Configuration.instance
-          .setEncryptedToken(response.data["encryptedToken"]);
+          .setEncryptedToken(responseData["encryptedToken"]);
      await Configuration.instance.setKeyAttributes(
-        KeyAttributes.fromMap(response.data["keyAttributes"]),
+        KeyAttributes.fromMap(responseData["keyAttributes"]),
      );
    } else {
-      await Configuration.instance.setToken(response.data["token"]);
+      await Configuration.instance.setToken(responseData["token"]);
    }
  }

--- a/mobile/lib/ui/account/login_page.dart
+++ b/mobile/lib/ui/account/login_page.dart
@ -69,6 +69,7 @@ class _LoginPageState extends State<LoginPage> {
        buttonText: S.of(context).logInLabel,
        onPressedFunction: () async {
          await UserService.instance.setEmail(_email!);
+          Configuration.instance.resetVolatilePassword();
          SrpAttributes? attr;
          bool isEmailVerificationEnabled = true;
          try {
--- a/mobile/lib/ui/account/passkey_page.dart
+++ b/mobile/lib/ui/account/passkey_page.dart
@ -0,0 +1,118 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
+import 'package:photos/core/configuration.dart';
+import 'package:photos/ente_theme_data.dart';
+import "package:photos/generated/l10n.dart";
+import 'package:photos/services/user_service.dart';
+import 'package:uni_links/uni_links.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class PasskeyPage extends StatefulWidget {
+  final String sessionID;
+
+  const PasskeyPage(
+    this.sessionID, {
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  State<PasskeyPage> createState() => _PasskeyPageState();
+}
+
+class _PasskeyPageState extends State<PasskeyPage> {
+  final Logger _logger = Logger("PasskeyPage");
+
+  @override
+  void initState() {
+    launchPasskey();
+    _initDeepLinks();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  Future<void> launchPasskey() async {
+    await launchUrlString(
+      "https://accounts.ente.io/passkeys/flow?"
+      "passkeySessionID=${widget.sessionID}"
+      "&redirect=ente://passkey",
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
+  Future<void> _handleDeeplink(String? link) async {
+    if (!context.mounted ||
+        Configuration.instance.hasConfiguredAccount() ||
+        link == null) {
+      return;
+    }
+    if (mounted && link.toLowerCase().startsWith("ente://passkey")) {
+      final uri = Uri.parse(link).queryParameters['response'];
+
+      // response to json
+      final res = utf8.decode(base64.decode(uri!));
+      final json = jsonDecode(res) as Map<String, dynamic>;
+
+      try {
+        await UserService.instance.onPassKeyVerified(context, json);
+      } catch (e) {
+        _logger.severe(e);
+      }
+    }
+  }
+
+  Future<bool> _initDeepLinks() async {
+    // Attach a listener to the stream
+    linkStream.listen(
+      _handleDeeplink,
+      onError: (err) {
+        _logger.severe(err);
+      },
+    );
+    return false;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(
+          S.of(context).passkeyAuthTitle,
+        ),
+      ),
+      body: _getBody(),
+    );
+  }
+
+  Widget _getBody() {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Text(
+            S.of(context).waitingForBrowserRequest,
+            style: const TextStyle(
+              height: 1.4,
+              fontSize: 16,
+            ),
+          ),
+          const SizedBox(height: 16),
+          Container(
+            width: double.infinity,
+            padding: const EdgeInsets.symmetric(horizontal: 32),
+            child: ElevatedButton(
+              style: Theme.of(context).colorScheme.optionalActionButtonStyle,
+              onPressed: launchPasskey,
+              child: Text(S.of(context).launchPasskeyUrlAgain),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/mobile/lib/ui/account/password_entry_page.dart
+++ b/mobile/lib/ui/account/password_entry_page.dart
@ -437,7 +437,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
    try {
      final KeyGenResult result =
          await Configuration.instance.generateKey(password);
-      Configuration.instance.setVolatilePassword(null);
+      Configuration.instance.resetVolatilePassword();
      await dialog.hide();
      onDone() async {
        final dialog = createProgressDialog(context, S.of(context).pleaseWait);
@ -445,7 +445,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
        try {
          await UserService.instance.setAttributes(result);
          await dialog.hide();
-          Configuration.instance.setVolatilePassword(null);
+          Configuration.instance.resetVolatilePassword();
          Bus.instance.fire(AccountConfiguredEvent());
          // ignore: unawaited_futures
          Navigator.of(context).pushAndRemoveUntil(
--- a/mobile/lib/ui/account/password_reentry_page.dart
+++ b/mobile/lib/ui/account/password_reentry_page.dart
@ -150,7 +150,7 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
      return;
    }
    await dialog.hide();
-    Configuration.instance.setVolatilePassword(null);
+    Configuration.instance.resetVolatilePassword();
    Bus.instance.fire(SubscriptionPurchasedEvent());
    unawaited(
      Navigator.of(context).pushAndRemoveUntil(
--- a/mobile/lib/ui/settings/about_section_widget.dart
+++ b/mobile/lib/ui/settings/about_section_widget.dart
@ -37,7 +37,7 @@ class AboutSectionWidget extends StatelessWidget {
          trailingIconIsMuted: true,
          onTap: () async {
            // ignore: unawaited_futures
-            launchUrl(Uri.parse("https://github.com/ente-io/photos-app"));
+            launchUrl(Uri.parse("https://github.com/ente-io/ente"));
          },
        ),
        sectionOptionSpacing,
--- a/mobile/lib/ui/settings/account_section_widget.dart
+++ b/mobile/lib/ui/settings/account_section_widget.dart
@ -8,12 +8,15 @@ import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/account/change_email_dialog.dart';
 import 'package:photos/ui/account/delete_account_page.dart';
 import 'package:photos/ui/account/password_entry_page.dart';
+import "package:photos/ui/account/recovery_key_page.dart";
 import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/expandable_menu_item_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import "package:photos/ui/payment/subscription.dart";
 import 'package:photos/ui/settings/common_settings.dart';
+import "package:photos/utils/crypto_util.dart";
 import 'package:photos/utils/dialog_util.dart';
+import "package:photos/utils/navigation_util.dart";
 import "package:url_launcher/url_launcher_string.dart";

 class AccountSectionWidget extends StatelessWidget {
@ -101,6 +104,43 @@ class AccountSectionWidget extends StatelessWidget {
          },
        ),
        sectionOptionSpacing,
+        MenuItemWidget(
+          captionedTextWidget: CaptionedTextWidget(
+            title: S.of(context).recoveryKey,
+          ),
+          pressedColor: getEnteColorScheme(context).fillFaint,
+          trailingIcon: Icons.chevron_right_outlined,
+          trailingIconIsMuted: true,
+          showOnlyLoadingState: true,
+          onTap: () async {
+            final hasAuthenticated = await LocalAuthenticationService.instance
+                .requestLocalAuthentication(
+              context,
+              S.of(context).authToViewYourRecoveryKey,
+            );
+            if (hasAuthenticated) {
+              String recoveryKey;
+              try {
+                recoveryKey = await _getOrCreateRecoveryKey(context);
+              } catch (e) {
+                await showGenericErrorDialog(context: context, error: e);
+                return;
+              }
+              unawaited(
+                routeToPage(
+                  context,
+                  RecoveryKeyPage(
+                    recoveryKey,
+                    S.of(context).ok,
+                    showAppBar: true,
+                    onDone: () {},
+                  ),
+                ),
+              );
+            }
+          },
+        ),
+        sectionOptionSpacing,
        MenuItemWidget(
          captionedTextWidget: CaptionedTextWidget(
            title: S.of(context).exportYourData,
@ -157,6 +197,12 @@ class AccountSectionWidget extends StatelessWidget {
    );
  }

+  Future<String> _getOrCreateRecoveryKey(BuildContext context) async {
+    return CryptoUtil.bin2hex(
+      await UserService.instance.getOrCreateRecoveryKey(context),
+    );
+  }
+
  void _onLogoutTapped(BuildContext context) {
    showChoiceActionSheet(
      context,
--- a/mobile/lib/ui/settings/security_section_widget.dart
+++ b/mobile/lib/ui/settings/security_section_widget.dart
@ -7,11 +7,13 @@ import 'package:photos/core/event_bus.dart';
 import 'package:photos/ente_theme_data.dart';
 import 'package:photos/events/two_factor_status_change_event.dart';
 import "package:photos/generated/l10n.dart";
+import "package:photos/l10n/l10n.dart";
 import "package:photos/models/user_details.dart";
+import "package:photos/services/feature_flag_service.dart";
 import 'package:photos/services/local_authentication_service.dart';
+import "package:photos/services/passkey_service.dart";
 import 'package:photos/services/user_service.dart';
 import 'package:photos/theme/ente_theme.dart';
-import "package:photos/ui/account/recovery_key_page.dart";
 import "package:photos/ui/account/request_pwd_verification_page.dart";
 import 'package:photos/ui/account/sessions_page.dart';
 import 'package:photos/ui/components/captioned_text_widget.dart';
@ -20,7 +22,6 @@ import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import 'package:photos/ui/components/toggle_switch_widget.dart';
 import 'package:photos/ui/settings/common_settings.dart';
 import "package:photos/utils/crypto_util.dart";
-import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/navigation_util.dart";
 import "package:photos/utils/toast_util.dart";

@ -67,45 +68,10 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
    final Completer completer = Completer();
    final List<Widget> children = [];
    if (_config.hasConfiguredAccount()) {
+      final bool isInternalUser =
+          FeatureFlagService.instance.isInternalUserOrDebugBuild();
      children.addAll(
        [
-          sectionOptionSpacing,
-          MenuItemWidget(
-            captionedTextWidget: CaptionedTextWidget(
-              title: S.of(context).recoveryKey,
-            ),
-            pressedColor: getEnteColorScheme(context).fillFaint,
-            trailingIcon: Icons.chevron_right_outlined,
-            trailingIconIsMuted: true,
-            showOnlyLoadingState: true,
-            onTap: () async {
-              final hasAuthenticated = await LocalAuthenticationService.instance
-                  .requestLocalAuthentication(
-                context,
-                S.of(context).authToViewYourRecoveryKey,
-              );
-              if (hasAuthenticated) {
-                String recoveryKey;
-                try {
-                  recoveryKey = await _getOrCreateRecoveryKey(context);
-                } catch (e) {
-                  await showGenericErrorDialog(context: context, error: e);
-                  return;
-                }
-                unawaited(
-                  routeToPage(
-                    context,
-                    RecoveryKeyPage(
-                      recoveryKey,
-                      S.of(context).ok,
-                      showAppBar: true,
-                      onDone: () {},
-                    ),
-                  ),
-                );
-              }
-            },
-          ),
          sectionOptionSpacing,
          MenuItemWidget(
            captionedTextWidget: CaptionedTextWidget(
@ -135,6 +101,17 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
              },
            ),
          ),
+          if (isInternalUser) sectionOptionSpacing,
+          if (isInternalUser)
+            MenuItemWidget(
+              captionedTextWidget: CaptionedTextWidget(
+                title: context.l10n.passkey,
+              ),
+              pressedColor: getEnteColorScheme(context).fillFaint,
+              trailingIcon: Icons.chevron_right_outlined,
+              trailingIconIsMuted: true,
+              onTap: () => PasskeyService.instance.openPasskeyPage(context),
+            ),
          sectionOptionSpacing,
          MenuItemWidget(
            captionedTextWidget: CaptionedTextWidget(
@ -255,12 +232,6 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
    );
  }

-  Future<String> _getOrCreateRecoveryKey(BuildContext context) async {
-    return CryptoUtil.bin2hex(
-      await UserService.instance.getOrCreateRecoveryKey(context),
-    );
-  }
-
  Future<void> updateEmailMFA(bool isEnabled) async {
    try {
      final UserDetails details =
--- a/mobile/lib/ui/settings/support_section_widget.dart
+++ b/mobile/lib/ui/settings/support_section_widget.dart
@ -57,7 +57,7 @@ class SupportSectionWidget extends StatelessWidget {
          onTap: () async {
            // ignore: unawaited_futures
            launchUrlString(
-              githubIssuesUrl,
+              githubDiscussionsUrl,
              mode: LaunchMode.externalApplication,
            );
          },
--- a/Show more
+++ b/Show more