[PM-2287] Add trust device to master password unlock. Change trust device method. Remove email from SSO login page.

code format
[PM-2293] Trust device after admin request login.
2025-12-05 23:53:33 +00:00 · 2023-07-10 19:37:32 +01:00 · 2023-07-10 18:36:36 +01:00 · 2023-07-10 15:34:54 +01:00 · 2023-07-10 13:44:26 +01:00 · 2023-07-10 12:37:31 +01:00
458 changed files with 7783 additions and 233274 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,34 +0,0 @@
-# Please sort lines alphabetically, this will ensure we don't accidentally add duplicates.
-#
-# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-
-# The following owners will be the default owners for everything in the repo.
-# Unless a later match takes precedence
-# @bitwarden/tech-leads
-
-@bitwarden/dept-development-mobile
-
-## Auth team files ##
-
-## Platform team files ##
-appIcons @bitwarden/team-platform-dev
-build.cake @bitwarden/team-platform-dev
-
-## Vault team files ##
-src/watchOS @bitwarden/team-vault-dev
-
-## Tools team files ##
-src/Core/Services/EmailForwarders @bitwarden/team-tools-dev
-
-## Crowdin Sync files ##
-src/App/Resources @bitwarden/team-tools-dev
-src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization @bitwarden/team-tools-dev
-store/apple @bitwarden/team-tools-dev
-store/google @bitwarden/team-tools-dev
-
-## Locales ## 
-src/App/Resources/AppResources.Designer.cs
-src/App/Resources/AppResources.resx
-src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization/en.lproj
-store/apple/en
-store/google/en
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,14 +9,15 @@ on:
    paths-ignore:
      - ".github/workflows/**"
  workflow_dispatch:
+    inputs: {}

 jobs:
  cloc:
    name: CLOC
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

      - name: Set up CLOC
        run: |
@@ -29,13 +30,13 @@ jobs:

  setup:
    name: Setup
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    outputs:
      rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }}
      hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
        with:
          submodules: 'true'

@@ -53,6 +54,7 @@ jobs:
          else
            echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT
          fi
+        shell: bash


  android:
@@ -69,23 +71,31 @@ jobs:
        with:
          nuget-version: 5.9.0

-      - name: Set up .NET
-        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
-        with:
-          dotnet-version: '3.1.x'
-
      - name: Set up MSBuild
        uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1

      - name: Setup Windows builder
        run: choco install checksum --no-progress

-      - name: Install Microsoft OpenJDK 11
+      - name: Work Around for broken Windows 2022 Runner Image
        run: |
-          choco install microsoft-openjdk11 --no-progress
-          Write-Output "JAVA_HOME=$(Get-ChildItem -Path 'C:\Program Files\Microsoft\jdk*' | Select -First 1 -ExpandProperty FullName)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Write-Output "Java Home: $env:JAVA_HOME"
-
+          Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
+          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
+          $componentsToAdd = @(
+            "Component.Xamarin"
+          )
+          [string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " +  $_}
+          $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
+          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
+          if ($process.ExitCode -eq 0)
+          {
+              Write-Host "components have been successfully added"
+          }
+          else
+          {
+              Write-Host "components were not installed"
+              exit 1
+          }
      - name: Print environment
        run: |
          nuget help | grep Version
@@ -95,10 +105,9 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
        with:
          fetch-depth: 0
-
      - name: Decrypt secrets
        env:
          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
@@ -112,7 +121,6 @@ jobs:
          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
            --output $HOME/secrets/play_creds.json ./.github/secrets/play_creds.json.gpg
        shell: bash
-
      - name: Decrypt secrets - Google Services
        if: ${{ matrix.variant == 'prod' }}
        env:
@@ -121,7 +129,6 @@ jobs:
          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
            --output ./src/Android/google-services.json ./.github/secrets/google-services.json.gpg
        shell: bash
-
      - name: Increment version
        run: |
          BUILD_NUMBER=$((3000 + $GITHUB_RUN_NUMBER))
@@ -139,12 +146,15 @@ jobs:

      - name: Restore tools
        run: dotnet tool restore
+        shell: pwsh

      - name: Verify Format
        run: dotnet tool run dotnet-format --check
+        shell: pwsh

      - name: Run Core tests
        run: dotnet test test/Core.Test/Core.Test.csproj --logger "trx;LogFileName=test-results.trx"
+        shell: pwsh

      - name: Report test results
        uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226 # v1.6.0
@@ -171,6 +181,8 @@ jobs:
          Write-Output "########################################"
          msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"

+        shell: pwsh
+
      - name: Sign Android Build
        env:
          PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }}
@@ -217,10 +229,10 @@ jobs:
          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).apk");

          Copy-Item $signedApkPath $signedApkDestPath
-
+        shell: pwsh
      - name: Upload Prod .aab artifact
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
        with:
          name: com.x8bit.bitwarden.aab
          path: ./com.x8bit.bitwarden.aab
@@ -228,7 +240,7 @@ jobs:

      - name: Upload Prod .apk artifact
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
        with:
          name: com.x8bit.bitwarden.apk
          path: ./com.x8bit.bitwarden.apk
@@ -236,7 +248,7 @@ jobs:

      - name: Upload Other .apk artifact
        if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
        with:
          name: com.x8bit.bitwarden.${{ matrix.variant }}.apk
          path: ./com.x8bit.bitwarden.${{ matrix.variant }}.apk
@@ -256,7 +268,7 @@ jobs:

      - name: Upload .apk sha file for prod
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
        with:
          name: bw-android-apk-sha256.txt
          path: ./bw-android-apk-sha256.txt
@@ -264,7 +276,7 @@ jobs:

      - name: Upload .apk sha file for other
        if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
        with:
          name: bw-android-${{ matrix.variant }}-apk-sha256.txt
          path: ./bw-android-${{ matrix.variant }}-apk-sha256.txt
@@ -301,11 +313,25 @@ jobs:
      - name: Setup Windows builder
        run: choco install checksum --no-progress

-      - name: Install Microsoft OpenJDK 11
+      - name: Work Around for broken Windows 2022 Runner Image
        run: |
-          choco install microsoft-openjdk11 --no-progress
-          Write-Output "JAVA_HOME=$(Get-ChildItem -Path 'C:\Program Files\Microsoft\jdk*' | Select -First 1 -ExpandProperty FullName)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Write-Output "Java Home: $env:JAVA_HOME"
+          Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
+          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
+          $componentsToAdd = @(
+            "Component.Xamarin"
+          )
+          [string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " +  $_}
+          $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
+          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
+          if ($process.ExitCode -eq 0)
+          {
+              Write-Host "components have been successfully added"
+          }
+          else
+          {
+              Write-Host "components were not installed"
+              exit 1
+          }

      - name: Print environment
        run: |
@@ -316,7 +342,7 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

      - name: Decrypt secrets
        env:
@@ -410,6 +436,7 @@ jobs:
          $appCenterNode.ParentNode.RemoveChild($appCenterNode);

          $xml.Save($corePath);
+        shell: pwsh

      - name: Restore packages
        run: nuget restore
@@ -423,6 +450,7 @@ jobs:
          Write-Output "########################################"

          msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"
+        shell: pwsh

      - name: Sign for F-Droid
        env:
@@ -446,9 +474,10 @@ jobs:
          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden-fdroid.apk");

          Copy-Item $signedApkPath $signedApkDestPath
+        shell: pwsh

      - name: Upload F-Droid .apk artifact
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
        with:
          name: com.x8bit.bitwarden-fdroid.apk
          path: ./com.x8bit.bitwarden-fdroid.apk
@@ -460,7 +489,7 @@ jobs:
            -t sha256 | Out-File -Encoding ASCII ./bw-fdroid-apk-sha256.txt

      - name: Upload F-Droid sha file
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
        with:
          name: bw-fdroid-apk-sha256.txt
          path: ./bw-fdroid-apk-sha256.txt
@@ -486,21 +515,28 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
        with:
          submodules: 'true'

      - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
        with:
          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "appcenter-ios-token"
+        env:
+          KEYVAULT: bitwarden-ci
+          SECRETS: |
+            appcenter-ios-token
+        run: |
+          for i in ${SECRETS//,/ }
+          do
+            VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
+            echo "::add-mask::$VALUE"
+            echo "$i=$VALUE" >> $GITHUB_OUTPUT
+          done

      - name: Decrypt secrets
        env:
@@ -529,6 +565,7 @@ jobs:
            ./.github/secrets/dist_watch_app_extension.mobileprovision.gpg
          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
            --output ./src/watchOS/bitwarden/GoogleService-Info.plist ./.github/secrets/GoogleService-Info.plist.gpg
+        shell: bash

      - name: Increment version
        run: |
@@ -544,6 +581,8 @@ jobs:
          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.ShareExtension/Info.plist
          cd src/watchOS/bitwarden
          agvtool new-version -all  $BUILD_NUMBER
+          cd ../../..
+        shell: bash

      - name: Update Entitlements
        run: |
@@ -552,6 +591,7 @@ jobs:
          echo "########################################"

          perl -0777 -pi.bak -e 's/<key>aps-environment<\/key>\s*<string>development<\/string>/<key>aps-environment<\/key>\n\t<string>production<\/string>/' ./src/iOS/Entitlements.plist
+        shell: bash

      - name: Set up Keychain
        env:
@@ -568,6 +608,7 @@ jobs:
          security import ~/secrets/iphone-distribution-cert.p12 -k build.keychain -P $DIST_CERT_PASSWORD \
            -T /usr/bin/codesign -T /usr/bin/security
          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
+        shell: bash

      - name: Set up provisioning profiles
        run: |
@@ -598,6 +639,7 @@ jobs:

          WATCH_APP_EXTENSION_UUID=$(grep UUID -A1 -a $WATCH_APP_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
          cp $WATCH_APP_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_EXTENSION_UUID.mobileprovision"
+        shell: bash

      - name: Bulid WatchApp
        run: |
@@ -610,6 +652,7 @@ jobs:
          echo "########################################"
          echo "##### Done"
          echo "########################################"
+        shell: bash

      - name: Restore packages
        run: nuget restore
@@ -619,22 +662,6 @@ jobs:
          $configuration = "AppStore";
          $platform = "iPhone";

-          Write-Output "########################################"
-          Write-Output "##### Archive $configuration Configuration for $platform Platform"
-          Write-Output "########################################"
-          msbuild "$($env:GITHUB_WORKSPACE + "/src/iOS/iOS.csproj")" "/p:Platform=$platform" `
-            "/p:Configuration=$configuration" "/p:ArchiveOnBuild=true" "/t:`"Build`""
-
-          Write-Output "########################################"
-          Write-Output "##### Done"
-          Write-Output "########################################"
-        shell: pwsh
-
-      - name: Archive Build for Mobile Automation
-        run: |
-          $configuration = "Release";
-          $platform = "iPhoneSimulator";
-
          Write-Output "########################################"
          Write-Output "##### Archive $configuration Configuration for $platform Platform"
          Write-Output "########################################"
@@ -655,14 +682,7 @@ jobs:

          xcodebuild -exportArchive -archivePath $ARCHIVE_PATH -exportPath $EXPORT_PATH \
            -exportOptionsPlist $EXPORT_OPTIONS_PATH
-
-      - name: Export .app for Automation CI
-        run: |
-          ARCHIVE_PATH="./src/iOS/bin/iPhoneSimulator/Release/BitwardeniOS.app"
-          EXPORT_PATH="./bitwarden-export"
-
-          zip -r -q BitwardeniOS.app.zip $ARCHIVE_PATH
-          mv BitwardeniOS.app.zip $EXPORT_PATH
+        shell: bash

      - name: Copy all dSYMs files to upload
        run: |
@@ -675,9 +695,10 @@ jobs:
          cp -r -v $ARCHIVE_DSYMS_PATH $EXPORT_PATH
          mkdir $WATCH_DSYMS_EXPORT_PATH
          cp -r -v $WATCH_ARCHIVE_DSYMS_PATH $WATCH_DSYMS_EXPORT_PATH
+        shell: bash

      - name: Upload App Store .ipa & dSYMs artifacts
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
        with:
          name: Bitwarden iOS
          path: |
@@ -685,13 +706,6 @@ jobs:
            ./bitwarden-export/dSYMs/*.*
          if-no-files-found: error

-      - name: Upload .app file for Automation CI
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
-        with:
-          name: BitwardeniOS.app.zip
-          path: ./bitwarden-export/BitwardeniOS.app.zip
-          if-no-files-found: error
-
      - name: Install AppCenter CLI
        if: |
          (github.ref == 'refs/heads/master'
@@ -711,6 +725,7 @@ jobs:
        env:
          APPCENTER_IOS_TOKEN: ${{ steps.retrieve-secrets.outputs.appcenter-ios-token }}
        run: appcenter crashes upload-symbols -a bitwarden/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN
+        shell: bash

      - name: Upload Watch dSYMs to Firebase Crashlytics
        if: |
@@ -720,11 +735,13 @@ jobs:
          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
          || github.ref == 'refs/heads/hotfix-rc'
        run: |
+
          echo "########################################"
          echo "##### Uploading Watch dSYMs to Firebase"
          echo "########################################"

          find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \;
+        shell: bash

      - name: Deploy to App Store
        if: |
@@ -739,6 +756,7 @@ jobs:
        run: |
          xcrun altool --upload-app --type ios --file "./bitwarden-export/Bitwarden.ipa" \
              --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD"
+        shell: bash


  crowdin-push:
@@ -748,24 +766,31 @@ jobs:
      - android
      - f-droid
      - ios
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    env:
      _CROWDIN_PROJECT_ID: "269690"
    steps:
      - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

      - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
        with:
          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "crowdin-api-token"
+        env:
+          KEYVAULT: bitwarden-ci
+          SECRETS: |
+            crowdin-api-token
+        run: |
+          for i in ${SECRETS//,/ }
+          do
+            VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
+            echo "::add-mask::$VALUE"
+            echo "$i=$VALUE" >> $GITHUB_OUTPUT
+          done

      - name: Upload Sources
        uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
@@ -782,7 +807,7 @@ jobs:
  check-failures:
    name: Check for failures
    if: always()
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    needs:
      - cloc
      - android
@@ -815,18 +840,25 @@ jobs:
          fi

      - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
        if: failure()
        with:
          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
        if: failure()
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "devops-alerts-slack-webhook-url"
+        env:
+          KEYVAULT: bitwarden-ci
+          SECRETS: |
+            devops-alerts-slack-webhook-url
+        run: |
+          for i in ${SECRETS//,/ }
+          do
+            VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
+            echo "::add-mask::$VALUE"
+            echo "$i=$VALUE" >> $GITHUB_OUTPUT
+          done

      - name: Notify Slack on failure
        uses: act10ns/slack@ed1309ab9862e57e9e583e51c7889486b9a00b0f # v2.0.0
--- a/.github/workflows/crowdin-pull.yml
+++ b/.github/workflows/crowdin-pull.yml
@@ -18,13 +18,13 @@ jobs:
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

      - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
        with:
          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
        with:
          keyvault: "bitwarden-ci"
          secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -12,6 +12,6 @@ jobs:
      pull-requests: write
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594  # v4.3.0
+      - uses: actions/labeler@ba790c862c380240c6d5e7427be5ace9a05c754b  # v4.0.3
        with:
          sync-labels: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,11 +38,11 @@ jobs:
          fi

      - name: Checkout repo
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

      - name: Check Release Version
        id: version
-        uses: bitwarden/gh-actions/release-version-check@main
+        uses: bitwarden/gh-actions/release-version-check@34ecb67b2a357795dc893549df0795e7383ff50f
        with:
          release-type: ${{ github.event.inputs.release_type }}
          project-type: xamarin
@@ -87,7 +87,7 @@ jobs:

      - name: Create release
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: ncipollo/release-action@6c75be85e571768fa31b40abf38de58ba0397db5  # v1.13.0
+        uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01  # v1.9.0
        with:
          artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
                      ./com.x8bit.bitwarden.apk/com.x8bit.bitwarden.apk,
@@ -126,7 +126,7 @@ jobs:
    if: inputs.fdroid_publish
    steps:
      - name: Checkout repo
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

      - name: Download F-Droid .apk artifact
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
@@ -147,9 +147,9 @@ jobs:
          name: com.x8bit.bitwarden-fdroid.apk

      - name: Set up Node
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d  # v3.8.1
+        uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561  # v2.5.1
        with:
-          node-version: '16.x'
+          node-version: '10.x'

      - name: Set up F-Droid server
        run: |
--- a/.github/workflows/stale-bot.yml
+++ b/.github/workflows/stale-bot.yml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: 'Run stale action'
-        uses: actions/stale@f7176fd3007623b69d27091f9b9d4ab7995f0a06  # v5.2.1
+        uses: actions/stale@3cc123766321e9f15a6676375c154ccffb12a358  # v5.0.0
        with:
          stale-issue-label: 'needs-reply'
          stale-pr-label: 'needs-changes'
--- a/.github/workflows/version-auto-bump.yml
+++ b/.github/workflows/version-auto-bump.yml
@@ -14,7 +14,7 @@ jobs:
      version_number: ${{ steps.version.outputs.new-version }}
    steps:
      - name: Checkout Branch
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

      - name: Calculate bumped version
        id: version
@@ -32,8 +32,14 @@ jobs:
          echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT

  trigger_version_bump:
-    name: Bump version to ${{ needs.setup.outputs.version_number }}
-    needs: setup
+    name: "Version bump"
+    runs-on: ubuntu-22.04
+    needs:
+      - setup
+    steps:
+      - name: Bump version to ${{ needs.setup.outputs.version_number }}
        uses: ./.github/workflows/version-bump.yml
+        secrets:
+          AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
        with:
          version_number: ${{ needs.setup.outputs.version_number }}
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -12,6 +12,9 @@ on:
      version_number:
        required: true
        type: string
+    secrets:
+      AZURE_PROD_KV_CREDENTIALS:
+        required: true

 jobs:
  bump_version:
@@ -19,22 +22,22 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout Branch
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

      - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
        with:
         creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
        with:
          keyvault: "bitwarden-ci"
          secrets: "github-gpg-private-key, github-gpg-private-key-passphrase"

      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@d6f3f49f3345e29369fe57596a3ca8f94c4d2ca7 # v5.4.0
+        uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 # v5.2.0
        with:
          gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
          passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
@@ -45,31 +48,31 @@ jobs:
        run: git switch -c version_bump_${{ github.event.inputs.version_number }}

      - name: Bump Version - Android XML
-        uses: bitwarden/gh-actions/version-bump@main
+        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/Android/Properties/AndroidManifest.xml"

      - name: Bump Version - iOS.Autofill
-        uses: bitwarden/gh-actions/version-bump@main
+        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS.Autofill/Info.plist"

      - name: Bump Version - iOS.Extension
-        uses: bitwarden/gh-actions/version-bump@main
+        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS.Extension/Info.plist"

      - name: Bump Version - iOS.ShareExtension
-        uses: bitwarden/gh-actions/version-bump@main
+        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS.ShareExtension/Info.plist"

      - name: Bump Version - iOS
-        uses: bitwarden/gh-actions/version-bump@main
+        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS/Info.plist"
--- a/.github/workflows/workflow-linter.yml
+++ b/.github/workflows/workflow-linter.yml
@@ -8,4 +8,4 @@ on:

 jobs:
  call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@main
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@34ecb67b2a357795dc893549df0795e7383ff50f
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 # Bitwarden Mobile Application

-<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on F-Droid" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
+<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on Google Play" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>

 The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin iOS, and Xamarin Forms.

--- a/crowdin.yml
+++ b/crowdin.yml
@@ -38,15 +38,3 @@ files:
        pt-PT: pt-PT
        en-GB: en-GB
        en-IN: en-IN
-  - source: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/Localizable.strings"
-    dest: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/%original_file_name%"
-    translation: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization//%two_letters_code%.lproj/%original_file_name%"
-    update_option: update_as_unapproved
-    languages_mapping:
-      two_letters_code:
-        zh-CN: zh-Hans
-        zh-TW: zh-Hant
-        pt-BR: pt-BR
-        pt-PT: pt-PT
-        en-GB: en-GB
-        en-IN: en-IN
--- a/global.json
+++ b/global.json
@@ -1,7 +0,0 @@
-{
-  "sdk": {
-    "version": "7.0.400",
-    "rollForward": "latestPatch",
-    "allowPrerelease": false
-  }
-}
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -77,21 +77,21 @@
    <PackageReference Include="Portable.BouncyCastle">
      <Version>1.9.0</Version>
    </PackageReference>
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.3" />
-    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.18" />
-    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.21" />
-    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.1.2" />
-    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.4.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.16" />
+    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.19" />
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.0" />
+    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.3.1.1" />
    <PackageReference Include="Xamarin.Essentials">
-      <Version>1.8.0</Version>
+      <Version>1.7.5</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Firebase.Messaging">
-      <Version>123.1.2.2</Version>
+      <Version>123.1.1.1</Version>
    </PackageReference>
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
-    <PackageReference Include="Xamarin.Google.Dagger" Version="2.46.1.2" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
+    <PackageReference Include="Xamarin.Google.Dagger" Version="2.44.2.1" />
    <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
-      <Version>118.0.1.5</Version>
+      <Version>118.0.1.3</Version>
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
@@ -233,26 +233,6 @@
      <SubType></SubType>
      <Generator></Generator>
    </AndroidResource>
-    <AndroidResource Include="Resources\layout\validatable_input_dialog_layout.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
-    <AndroidResource Include="Resources\drawable\empty_uris_placeholder.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
-    <AndroidResource Include="Resources\drawable\empty_uris_placeholder_dark.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
-    <AndroidResource Include="Resources\drawable\empty_login_requests.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
-    <AndroidResource Include="Resources\drawable\empty_login_requests_dark.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\drawable\splash_screen.xml" />
--- a/src/Android/Assets/bwi-font.ttf
+++ b/src/Android/Assets/bwi-font.ttf
--- a/src/Android/Autofill/AutofillHelpers.cs
+++ b/src/Android/Autofill/AutofillHelpers.cs
@@ -20,7 +20,6 @@ using AndroidX.AutoFill.Inline.V1;
 using Bit.Core.Abstractions;
 using SaveFlags = Android.Service.Autofill.SaveFlags;
 using Bit.Droid.Utilities;
-using Bit.Core.Services;

 namespace Bit.Droid.Autofill
 {
@@ -153,9 +152,8 @@ namespace Bit.Droid.Autofill
            "androidapp://com.oneplus.applocker",
        };

-        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService cipherService, IUserVerificationService userVerificationService)
+        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService cipherService)
        {
-            var userHasMasterPassword = await userVerificationService.HasMasterPasswordAsync();
            if (parser.FieldCollection.FillableForLogin)
            {
                var ciphers = await cipherService.GetAllDecryptedByUrlAsync(parser.Uri);
@@ -163,14 +161,14 @@ namespace Bit.Droid.Autofill
                {
                    var allCiphers = ciphers.Item1.ToList();
                    allCiphers.AddRange(ciphers.Item2.ToList());
-                    var nonPromptCiphers = allCiphers.Where(cipher => !userHasMasterPassword || cipher.Reprompt == CipherRepromptType.None);
+                    var nonPromptCiphers = allCiphers.Where(cipher => cipher.Reprompt == CipherRepromptType.None);
                    return nonPromptCiphers.Select(c => new FilledItem(c)).ToList();
                }
            }
            else if (parser.FieldCollection.FillableForCard)
            {
                var ciphers = await cipherService.GetAllDecryptedAsync();
-                return ciphers.Where(c => c.Type == CipherType.Card && (!userHasMasterPassword || c.Reprompt == CipherRepromptType.None)).Select(c => new FilledItem(c)).ToList();
+                return ciphers.Where(c => c.Type == CipherType.Card && c.Reprompt == CipherRepromptType.None).Select(c => new FilledItem(c)).ToList();
            }
            return new List<FilledItem>();
        }
--- a/src/Android/Autofill/AutofillService.cs
+++ b/src/Android/Autofill/AutofillService.cs
@@ -11,7 +11,6 @@ using Android.Widget;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Services;
 using Bit.Core.Utilities;

 namespace Bit.Droid.Autofill
@@ -27,7 +26,6 @@ namespace Bit.Droid.Autofill
        private IPolicyService _policyService;
        private IStateService _stateService;
        private LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
-        private IUserVerificationService _userVerificationService;

        public async override void OnFillRequest(FillRequest request, CancellationSignal cancellationSignal,
            FillCallback callback)
@@ -66,9 +64,11 @@ namespace Bit.Droid.Autofill
                var locked = await _vaultTimeoutService.IsLockedAsync();
                if (!locked)
                {
-                    _cipherService ??= ServiceContainer.Resolve<ICipherService>();
-                    _userVerificationService ??=  ServiceContainer.Resolve<IUserVerificationService>();
-                    items = await AutofillHelpers.GetFillItemsAsync(parser, _cipherService, _userVerificationService);
+                    if (_cipherService == null)
+                    {
+                        _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
+                    }
+                    items = await AutofillHelpers.GetFillItemsAsync(parser, _cipherService);
                }

                // build response
--- a/src/Android/Constants.cs
+++ b/src/Android/Constants.cs
@@ -3,11 +3,5 @@
    public static class Constants
    {
        public const string PACKAGE_NAME = "com.x8bit.bitwarden";
-        public const string TEMP_CAMERA_IMAGE_NAME = "temp_camera_image.jpg";
-        
-        /// <summary>
-        /// This directory must also be declared in filepaths.xml
-        /// </summary>
-        public const string TEMP_CAMERA_IMAGE_DIR = "camera_temp";
    }
 }
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -116,7 +116,7 @@ namespace Bit.Droid
                {
                    ListenYubiKey((bool)message.Data);
                }
-                else if (message.Command is ThemeManager.UPDATED_THEME_MESSAGE_KEY)
+                else if (message.Command == "updatedTheme")
                {
                    Xamarin.Forms.Device.BeginInvokeOnMainThread(() => AppearanceAdjustments());
                }
@@ -238,23 +238,19 @@ namespace Bit.Droid
                Android.Net.Uri uri = null;
                string fileName = null;
                if (data != null && data.Data != null)
-                {
-                    if (data.Data.ToString()?.Contains(Constants.PACKAGE_NAME) != true)
                {
                    uri = data.Data;
                    fileName = AndroidHelpers.GetFileName(ApplicationContext, uri);
                }
-                }
                else
                {
                    // camera
-                    var tmpDir = new Java.IO.File(FilesDir, Constants.TEMP_CAMERA_IMAGE_DIR);
-                    var file = new Java.IO.File(tmpDir, Constants.TEMP_CAMERA_IMAGE_NAME);
+                    var file = new Java.IO.File(FilesDir, "temp_camera_photo.jpg");
                    uri = FileProvider.GetUriForFile(this, "com.x8bit.bitwarden.fileprovider", file);
                    fileName = $"photo_{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.jpg";
                }

-                if (uri == null || fileName == null)
+                if (uri == null)
                {
                    return;
                }
--- a/src/Android/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -68,9 +68,9 @@ namespace Bit.Droid
                ServiceContainer.Register<IDeleteAccountActionFlowExecutioner>("deleteAccountActionFlowExecutioner", deleteAccountActionFlowExecutioner);

                var verificationActionsFlowHelper = new VerificationActionsFlowHelper(
+                    ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService"),
                    ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService"),
-                    ServiceContainer.Resolve<ICryptoService>("cryptoService"),
-                    ServiceContainer.Resolve<IUserVerificationService>());
+                    ServiceContainer.Resolve<ICryptoService>("cryptoService"));
                ServiceContainer.Register<IVerificationActionsFlowHelper>("verificationActionsFlowHelper", verificationActionsFlowHelper);

                var accountsManager = new AccountsManager(
@@ -156,11 +156,10 @@ namespace Bit.Droid
                messagingService, broadcasterService);
            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService,
                platformUtilsService, new LazyResolve<IEventService>());
+            var biometricService = new BiometricService(stateService);
            var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
            var cryptoService = new CryptoService(stateService, cryptoFunctionService);
-            var biometricService = new BiometricService(stateService, cryptoService);
-            var userPinService = new UserPinService(stateService, cryptoService);
-            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService, stateService);
+            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);

            ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
            ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
@@ -183,7 +182,6 @@ namespace Bit.Droid
            ServiceContainer.Register<ICryptoService>("cryptoService", cryptoService);
            ServiceContainer.Register<IPasswordRepromptService>("passwordRepromptService", passwordRepromptService);
            ServiceContainer.Register<IAvatarImageSourcePool>("avatarImageSourcePool", new AvatarImageSourcePool());
-            ServiceContainer.Register<IUserPinService>(userPinService);

            // Push
 #if FDROID
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.12.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.5.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
--- a/src/Android/Renderers/CustomLabelRenderer.cs
+++ b/src/Android/Renderers/CustomLabelRenderer.cs
@@ -1,10 +1,10 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.OS;
+using System;
 using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
+using System.ComponentModel;
 using Xamarin.Forms.Platform.Android;
+using Android.Content;
+using Xamarin.Forms;
+using Bit.Droid.Renderers;

 [assembly: ExportRenderer(typeof(CustomLabel), typeof(CustomLabelRenderer))]
 namespace Bit.Droid.Renderers
@@ -15,19 +15,6 @@ namespace Bit.Droid.Renderers
            : base(context)
        { }

-        protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
-        {
-            base.OnElementChanged(e);
-
-            if (Control != null && e.NewElement is CustomLabel label)
-            {
-                if (label.FontWeight.HasValue && Build.VERSION.SdkInt >= BuildVersionCodes.P)
-                {
-                    Control.Typeface = Android.Graphics.Typeface.Create(null, label.FontWeight.Value, false);
-                }
-            }
-        }
-
        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
        {
            var label = sender as CustomLabel;
@@ -41,3 +28,4 @@ namespace Bit.Droid.Renderers
        }
    }
 }
+
--- a/src/Android/Resources/drawable/empty_login_requests.xml
+++ b/src/Android/Resources/drawable/empty_login_requests.xml
@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="200"
-    android:viewportHeight="143"
-    android:width="200dp"
-    android:height="143dp">
-    <path
-        android:pathData="M34 43H10C6.68629 43 4 45.6863 4 49V109C4 112.314 6.68629 115 10 115H34C37.3137 115 40 112.314 40 109V49C40 45.6863 37.3137 43 34 43ZM10 39C4.47715 39 0 43.4772 0 49V109C0 114.523 4.47715 119 10 119H34C39.5228 119 44 114.523 44 109V49C44 43.4772 39.5228 39 34 39H10Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M20.3701 47.809C20.3701 47.2567 20.8178 46.809 21.3701 46.809H22.6122C23.1645 46.809 23.6122 47.2567 23.6122 47.809C23.6122 48.3612 23.1645 48.809 22.6122 48.809H21.3701C20.8178 48.809 20.3701 48.3612 20.3701 47.809Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M68 120C68 119.448 68.4477 119 69 119H127C127.552 119 128 119.448 128 120C128 120.552 127.552 121 127 121H69C68.4477 121 68 120.552 68 120Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M87.7402 120V102.236H89.7402V120H87.7402Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M107.71 120V102.236H109.71V120H107.71Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M27 25C27 17.268 33.268 11 41 11H157C164.732 11 171 17.268 171 25V31H167V25C167 19.4772 162.523 15 157 15H41C35.4772 15 31 19.4772 31 25V41H27V25ZM42 99H127V103H42V99Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M35 26C35 22.134 38.134 19 42 19H156C159.866 19 163 22.134 163 26V31H161V26C161 23.2386 158.761 21 156 21H42C39.2386 21 37 23.2386 37 26V41H35V26ZM42 93H127V95H42V93Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M125 39C125 33.4771 129.477 29 135 29H188C193.523 29 198 33.4772 198 39V119C198 124.523 193.523 129 188 129H135C129.477 129 125 124.523 125 119V39ZM135 33C131.686 33 129 35.6863 129 39V119C129 122.314 131.686 125 135 125H188C191.314 125 194 122.314 194 119V39C194 35.6863 191.314 33 188 33H135Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M164 120C164 121.105 163.105 122 162 122C160.895 122 160 121.105 160 120C160 118.895 160.895 118 162 118C163.105 118 164 118.895 164 120Z"
-        android:fillColor="#89929F" />
-</vector>
--- a/src/Android/Resources/drawable/empty_login_requests_dark.xml
+++ b/src/Android/Resources/drawable/empty_login_requests_dark.xml
@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="200"
-    android:viewportHeight="143"
-    android:width="200dp"
-    android:height="143dp">
-    <path
-        android:pathData="M34 43H10C6.68629 43 4 45.6863 4 49V109C4 112.314 6.68629 115 10 115H34C37.3137 115 40 112.314 40 109V49C40 45.6863 37.3137 43 34 43ZM10 39C4.47715 39 0 43.4772 0 49V109C0 114.523 4.47715 119 10 119H34C39.5228 119 44 114.523 44 109V49C44 43.4772 39.5228 39 34 39H10Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M20.3701 47.809C20.3701 47.2567 20.8178 46.809 21.3701 46.809H22.6122C23.1645 46.809 23.6122 47.2567 23.6122 47.809C23.6122 48.3612 23.1645 48.809 22.6122 48.809H21.3701C20.8178 48.809 20.3701 48.3612 20.3701 47.809Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M68 120C68 119.448 68.4477 119 69 119H127C127.552 119 128 119.448 128 120C128 120.552 127.552 121 127 121H69C68.4477 121 68 120.552 68 120Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M87.7402 120V102.236H89.7402V120H87.7402Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M107.71 120V102.236H109.71V120H107.71Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M27 25C27 17.268 33.268 11 41 11H157C164.732 11 171 17.268 171 25V31H167V25C167 19.4772 162.523 15 157 15H41C35.4772 15 31 19.4772 31 25V41H27V25ZM42 99H127V103H42V99Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M35 26C35 22.134 38.134 19 42 19H156C159.866 19 163 22.134 163 26V31H161V26C161 23.2386 158.761 21 156 21H42C39.2386 21 37 23.2386 37 26V41H35V26ZM42 93H127V95H42V93Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M125 39C125 33.4771 129.477 29 135 29H188C193.523 29 198 33.4772 198 39V119C198 124.523 193.523 129 188 129H135C129.477 129 125 124.523 125 119V39ZM135 33C131.686 33 129 35.6863 129 39V119C129 122.314 131.686 125 135 125H188C191.314 125 194 122.314 194 119V39C194 35.6863 191.314 33 188 33H135Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M164 120C164 121.105 163.105 122 162 122C160.895 122 160 121.105 160 120C160 118.895 160.895 118 162 118C163.105 118 164 118.895 164 120Z"
-        android:fillColor="#A3A3A3" />
-</vector>
--- a/src/Android/Resources/drawable/empty_uris_placeholder.xml
+++ b/src/Android/Resources/drawable/empty_uris_placeholder.xml
@@ -1,35 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="129"
-    android:viewportHeight="124"
-    android:width="129dp"
-    android:height="124dp">
-    <path
-        android:pathData="M126.8227 61.9441A59.6843 59.6843 0 0 1 7.4541 61.9441A59.6843 59.6843 0 0 1 126.8227 61.9441Z"
-        android:fillColor="#F0F0F0"
-        android:strokeColor="#89929F"
-        android:strokeWidth="3" />
-    <path
-        android:pathData="M21.6167 100.851C52.597 103.31 79.6937 80.3264 82.1391 49.5156C83.6205 30.8497 76.0789 14.8844 62.7275 3.63385"
-        android:strokeColor="#89929F"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M14.5633 34.2845C12.2035 66.7711 38.5225 96.3429 72.6666 98.8232C74.2596 98.9389 78.629 98.9975 80.1951 99C84.6245 98.8232 97.8063 96.593 106.813 91.8485C113.439 88.3581 119.745 84.6984 124.644 79.1121"
-        android:strokeColor="#89929F"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M124.502 48.5051C106.554 24.3817 68.8237 21.6709 41.4178 42.0617C24.8146 54.4149 14.7327 72.4183 13.9255 90.1427"
-        android:strokeColor="#89929F"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M83.4034 28.3934A5 5 0 0 1 73.4034 28.3934A5 5 0 0 1 83.4034 28.3934Z"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M24.7698 66.5518A5 5 0 0 1 14.7698 66.5518A5 5 0 0 1 24.7698 66.5518Z"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M57.344 94.4726A5 5 0 0 1 47.344 94.4726A5 5 0 0 1 57.344 94.4726Z"
-        android:fillColor="#89929F" />
-</vector>
--- a/src/Android/Resources/drawable/empty_uris_placeholder_dark.xml
+++ b/src/Android/Resources/drawable/empty_uris_placeholder_dark.xml
@@ -1,35 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="129"
-    android:viewportHeight="124"
-    android:width="129dp"
-    android:height="124dp">
-    <path
-        android:pathData="M126.8227 61.9441A59.6843 59.6843 0 0 1 7.4541 61.9441A59.6843 59.6843 0 0 1 126.8227 61.9441Z"
-        android:fillColor="@android:color/transparent"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="3" />
-    <path
-        android:pathData="M21.6167 100.851C52.597 103.31 79.6937 80.3264 82.1391 49.5156C83.6205 30.8497 76.0789 14.8844 62.7275 3.63385"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M14.5633 34.2845C12.2035 66.7711 38.5225 96.3429 72.6666 98.8232C74.2596 98.9389 78.629 98.9975 80.1951 99C84.6245 98.8232 97.8063 96.593 106.813 91.8485C113.439 88.3581 119.745 84.6984 124.644 79.1121"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M124.502 48.5051C106.554 24.3817 68.8237 21.6709 41.4178 42.0617C24.8146 54.4149 14.7327 72.4183 13.9255 90.1427"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M83.4034 28.3934A5 5 0 0 1 73.4034 28.3934A5 5 0 0 1 83.4034 28.3934Z"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M24.7698 66.5518A5 5 0 0 1 14.7698 66.5518A5 5 0 0 1 24.7698 66.5518Z"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M57.344 94.4726A5 5 0 0 1 47.344 94.4726A5 5 0 0 1 57.344 94.4726Z"
-        android:fillColor="#A3A3A3" />
-</vector>
--- a/src/Android/Resources/layout/validatable_input_dialog_layout.xml
+++ b/src/Android/Resources/layout/validatable_input_dialog_layout.xml
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="30dp"
-    android:paddingRight="30dp">
-    <TextView
-        android:id="@+id/lblHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/dialog_header_text_size"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="-3dp"
-        android:labelFor="@+id/txtValue"/>
-    <EditText
-        android:id="@id/txtValue"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/dialog_input_text_size"/>
-    <TextView
-        android:id="@+id/lblValueSubinfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/dialog_sub_value_info_text_size"/>
-</LinearLayout>
-
--- a/src/Android/Resources/values/dimens.xml
+++ b/src/Android/Resources/values/dimens.xml
@@ -2,7 +2,4 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
  <dimen name="design_bottom_navigation_text_size" tools:override="true">15sp</dimen>
  <dimen name="design_bottom_navigation_active_text_size" tools:override="true">15sp</dimen>
-  <dimen name="dialog_input_text_size">16sp</dimen>
-  <dimen name="dialog_header_text_size">12sp</dimen>
-  <dimen name="dialog_sub_value_info_text_size">12sp</dimen>
 </resources>
--- a/src/Android/Resources/xml/filepaths.xml
+++ b/src/Android/Resources/xml/filepaths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
  <cache-path name="cache" path="." />
-  <files-path name="temp_camera_images" path="camera_temp/" />
+  <files-path name="internal" path="." />
 </paths>
--- a/src/Android/Services/BiometricService.cs
+++ b/src/Android/Services/BiometricService.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Android.OS;
 using Android.Security.Keystore;
-using Bit.App.Services;
 using Bit.Core.Abstractions;
 using Bit.Core.Services;
 using Java.Security;
@@ -10,8 +9,10 @@ using Javax.Crypto;

 namespace Bit.Droid.Services
 {
-    public class BiometricService : BaseBiometricService
+    public class BiometricService : IBiometricService
    {
+        private readonly IStateService _stateService;
+
        private const string KeyName = "com.8bit.bitwarden.biometric_integrity";

        private const string KeyStoreName = "AndroidKeyStore";
@@ -23,14 +24,14 @@ namespace Bit.Droid.Services

        private readonly KeyStore _keystore;

-        public BiometricService(IStateService stateService, ICryptoService cryptoService)
-            : base(stateService, cryptoService)
+        public BiometricService(IStateService stateService)
        {
+            _stateService = stateService;
            _keystore = KeyStore.GetInstance(KeyStoreName);
            _keystore.Load(null);
        }

-        public override async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
+        public async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
        {
            if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
            {
@@ -40,7 +41,7 @@ namespace Bit.Droid.Services
            return true;
        }

-        public override async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
+        public async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
        {
            if (Build.VERSION.SdkInt < BuildVersionCodes.M)
            {
--- a/src/Android/Services/DeviceActionService.cs
+++ b/src/Android/Services/DeviceActionService.cs
@@ -13,13 +13,12 @@ using Android.Views.InputMethods;
 using Android.Widget;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.App.Utilities.Prompts;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Utilities;
 using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
-using Xamarin.Forms.Platform.Android;
+using static Bit.App.Pages.SettingsPageViewModel;

 namespace Bit.Droid.Services
 {
@@ -210,7 +209,10 @@ namespace Bit.Droid.Services
            }
            if (numericKeyboard)
            {
-                SetNumericKeyboardTo(input);
+                input.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
+#pragma warning disable CS0618 // Type or member is obsolete
+                input.KeyListener = DigitsKeyListener.GetInstance(false, false);
+#pragma warning restore CS0618 // Type or member is obsolete
            }
            if (password)
            {
@@ -246,83 +248,6 @@ namespace Bit.Droid.Services
            return result.Task;
        }

-        public Task<ValidatablePromptResponse?> DisplayValidatablePromptAsync(ValidatablePromptConfig config)
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            if (activity == null)
-            {
-                return Task.FromResult<ValidatablePromptResponse?>(null);
-            }
-
-            var alertBuilder = new AlertDialog.Builder(activity);
-            alertBuilder.SetTitle(config.Title);
-            var view = activity.LayoutInflater.Inflate(Resource.Layout.validatable_input_dialog_layout, null);
-            alertBuilder.SetView(view);
-            
-            var result = new TaskCompletionSource<ValidatablePromptResponse?>();
-
-            alertBuilder.SetOnCancelListener(new BasicDialogWithResultCancelListener(result));
-            alertBuilder.SetPositiveButton(config.OkButtonText ?? AppResources.Ok, listener: null);
-            alertBuilder.SetNegativeButton(config.CancelButtonText ?? AppResources.Cancel, (sender, args) => result.TrySetResult(null));
-            if (!string.IsNullOrEmpty(config.ThirdButtonText))
-            {
-                alertBuilder.SetNeutralButton(config.ThirdButtonText, (sender, args) => result.TrySetResult(new ValidatablePromptResponse(null, true)));
-            }
-
-            var alert = alertBuilder.Create();
-
-            var input = view.FindViewById<EditText>(Resource.Id.txtValue);
-            var lblHeader = view.FindViewById<TextView>(Resource.Id.lblHeader);
-            var lblValueSubinfo = view.FindViewById<TextView>(Resource.Id.lblValueSubinfo);
-
-            lblHeader.Text = config.Subtitle;
-            lblValueSubinfo.Text = config.ValueSubInfo;
-
-            var defaultSubInfoColor = lblValueSubinfo.TextColors;
-
-            input.InputType = InputTypes.ClassText;
-
-            if (config.NumericKeyboard)
-            {
-                SetNumericKeyboardTo(input);
-            }
-
-            input.ImeOptions = input.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning | (ImeAction)ImeFlags.NoExtractUi;
-            input.Text = config.Text ?? string.Empty;
-            input.SetSelection(config.Text?.Length ?? 0);
-            input.AfterTextChanged += (sender, args) =>
-            {
-                if (lblValueSubinfo.Text != config.ValueSubInfo)
-                {
-                    lblValueSubinfo.Text = config.ValueSubInfo;
-                    lblHeader.SetTextColor(defaultSubInfoColor);
-                    lblValueSubinfo.SetTextColor(defaultSubInfoColor);
-                }
-            };
-
-            alert.Window.SetSoftInputMode(SoftInput.StateVisible);
-            alert.Show();
-
-            var positiveButton = alert.GetButton((int)DialogButtonType.Positive);
-            positiveButton.Click += (sender, args) =>
-            {
-                var error = config.ValidateText(input.Text);
-                if (error != null)
-                {
-                    lblHeader.SetTextColor(ThemeManager.GetResourceColor("DangerColor").ToAndroid());
-                    lblValueSubinfo.SetTextColor(ThemeManager.GetResourceColor("DangerColor").ToAndroid());
-                    lblValueSubinfo.Text = error;
-                    lblValueSubinfo.SendAccessibilityEvent(Android.Views.Accessibility.EventTypes.ViewFocused);
-                    return;
-                }
-
-                result.TrySetResult(new ValidatablePromptResponse(input.Text, false));
-                alert.Dismiss();
-            };
-
-            return result.Task;
-        }
-
        public void RateApp()
        {
            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
@@ -547,12 +472,6 @@ namespace Bit.Droid.Services
            return true;
        }

-        public bool SupportsAutofillServices() => Build.VERSION.SdkInt >= BuildVersionCodes.O;
-
-        public bool SupportsInlineAutofill() => Build.VERSION.SdkInt >= BuildVersionCodes.R;
-
-        public bool SupportsDrawOver() => Build.VERSION.SdkInt >= BuildVersionCodes.M;
-
        private Intent RateIntentForUrl(string url, Activity activity)
        {
            var intent = new Intent(Intent.ActionView, Android.Net.Uri.Parse($"{url}?id={activity.PackageName}"));
@@ -606,61 +525,5 @@ namespace Bit.Droid.Services
            // only used by iOS
            throw new NotImplementedException();
        }
-
-        public string GetAutofillAccessibilityDescription()
-        {
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.LollipopMr1)
-            {
-                return AppResources.AccessibilityDescription;
-            }
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.M)
-            {
-                return AppResources.AccessibilityDescription2;
-            }
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.NMr1)
-            {
-                return AppResources.AccessibilityDescription3;
-            }
-
-            return AppResources.AccessibilityDescription4;
-        }
-
-        public string GetAutofillDrawOverDescription()
-        {
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.M)
-            {
-                return AppResources.DrawOverDescription;
-            }
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.NMr1)
-            {
-                return AppResources.DrawOverDescription2;
-            }
-
-            return AppResources.DrawOverDescription3;
-        }
-
-        private void SetNumericKeyboardTo(EditText editText)
-        {
-            editText.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
-#pragma warning disable CS0618 // Type or member is obsolete
-            editText.KeyListener = DigitsKeyListener.GetInstance(false, false);
-#pragma warning restore CS0618 // Type or member is obsolete
-        }
-    }
-
-    class BasicDialogWithResultCancelListener : Java.Lang.Object, IDialogInterfaceOnCancelListener
-    {
-        private readonly TaskCompletionSource<ValidatablePromptResponse?> _taskCompletionSource;
-
-        public BasicDialogWithResultCancelListener(TaskCompletionSource<ValidatablePromptResponse?> taskCompletionSource)
-        {
-            _taskCompletionSource = taskCompletionSource;
-        }
-
-        public void OnCancel(IDialogInterface dialog)
-        {
-            _taskCompletionSource?.TrySetResult(null);
-            dialog?.Dismiss();
-        }
    }
 }
--- a/src/Android/Services/FileService.cs
+++ b/src/Android/Services/FileService.cs
@@ -190,8 +190,7 @@ namespace Bit.Droid.Services
                {
                    try
                    {
-                        var tmpDir = new Java.IO.File(activity.FilesDir, Constants.TEMP_CAMERA_IMAGE_DIR);
-                        var file = new Java.IO.File(tmpDir, Constants.TEMP_CAMERA_IMAGE_NAME);
+                        var file = new Java.IO.File(activity.FilesDir, "temp_camera_photo.jpg");
                        if (!file.Exists())
                        {
                            file.ParentFile.Mkdirs();
--- a/src/Android/Utilities/IntentExtensions.cs
+++ b/src/Android/Utilities/IntentExtensions.cs
@@ -1,6 +1,5 @@
 using Android.Content;
 using Android.OS;
-using Java.Lang;

 namespace Bit.Droid.Utilities
 {
@@ -14,12 +13,7 @@ namespace Bit.Droid.Utilities
                // Note: getting the bundle like this will cause to call unparcel() internally
                var b = intent?.Extras?.GetBundle("trashstringwhichhasnousebuttocheckunparcel");
            }
-            catch (Exception ex) when
-            (
-                ex is BadParcelableException ||
-                ex is ClassNotFoundException ||
-                ex is RuntimeException
-            )
+            catch (BadParcelableException)
            {
                intent.ReplaceExtras((Bundle)null);
            }
--- a/src/App/Abstractions/IDeviceActionService.cs
+++ b/src/App/Abstractions/IDeviceActionService.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Bit.App.Utilities.Prompts;
 using Bit.Core.Enums;
 using Bit.Core.Models;

@@ -19,7 +18,6 @@ namespace Bit.App.Abstractions
        Task<string> DisplayPromptAync(string title = null, string description = null, string text = null,
            string okButtonText = null, string cancelButtonText = null, bool numericKeyboard = false,
            bool autofocus = true, bool password = false);
-        Task<ValidatablePromptResponse?> DisplayValidatablePromptAsync(ValidatablePromptConfig config);
        Task<string> DisplayAlertAsync(string title, string message, string cancel, params string[] buttons);
        Task<string> DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons);

@@ -28,9 +26,6 @@ namespace Bit.App.Abstractions
        bool SupportsNfc();
        bool SupportsCamera();
        bool SupportsFido2();
-        bool SupportsAutofillServices();
-        bool SupportsInlineAutofill();
-        bool SupportsDrawOver();

        bool LaunchApp(string appName);
        void RateApp();
@@ -44,7 +39,5 @@ namespace Bit.App.Abstractions
        Task SetScreenCaptureAllowedAsync();
        void OpenAppSettings();
        void CloseExtensionPopUp();
-        string GetAutofillAccessibilityDescription();
-        string GetAutofillDrawOverDescription();
    }
 }
--- a/src/App/Abstractions/IPasswordRepromptService.cs
+++ b/src/App/Abstractions/IPasswordRepromptService.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Bit.Core.Enums;

 namespace Bit.App.Abstractions
 {
@@ -7,8 +6,10 @@ namespace Bit.App.Abstractions
    {
        string[] ProtectedFields { get; }

-        Task<bool> PromptAndCheckPasswordIfNeededAsync(CipherRepromptType repromptType = CipherRepromptType.Password);
+        Task<bool> ShowPasswordPromptAsync();

        Task<(string password, bool valid)> ShowPasswordPromptAndGetItAsync();
+
+        Task<bool> Enabled();
    }
 }
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -16,9 +16,9 @@
    <PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.3" />
    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.6" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
    <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
    <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
    <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
    <PackageReference Include="MessagePack" Version="2.4.59" />
@@ -59,6 +59,9 @@
    <Compile Update="Pages\Settings\ExtensionPage.xaml.cs">
      <DependentUpon>ExtensionPage.xaml</DependentUpon>
    </Compile>
+    <Compile Update="Pages\Settings\AutofillServicesPage.xaml.cs">
+      <DependentUpon>AutofillServicesPage.xaml</DependentUpon>
+    </Compile>
    <Compile Update="Pages\Settings\FolderAddEditPage.xaml.cs">
      <DependentUpon>FolderAddEditPage.xaml</DependentUpon>
    </Compile>
@@ -68,6 +71,12 @@
    <Compile Update="Pages\Settings\ExportVaultPage.xaml.cs">
      <DependentUpon>ExportVaultPage.xaml</DependentUpon>
    </Compile>
+    <Compile Update="Pages\Settings\OptionsPage.xaml.cs">
+      <DependentUpon>OptionsPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="Pages\Settings\SyncPage.xaml.cs">
+      <DependentUpon>SyncPage.xaml</DependentUpon>
+    </Compile>
    <Compile Update="Pages\Vault\AttachmentsPage.xaml.cs">
      <DependentUpon>AttachmentsPage.xaml</DependentUpon>
    </Compile>
@@ -137,8 +146,6 @@
    <Folder Include="Controls\IconLabelButton\" />
    <Folder Include="Controls\PasswordStrengthProgressBar\" />
    <Folder Include="Utilities\Automation\" />
-    <Folder Include="Utilities\Prompts\" />
-    <Folder Include="Controls\Settings\" />
  </ItemGroup>

  <ItemGroup>
@@ -435,7 +442,5 @@
    <None Remove="MessagePack.MSBuild.Tasks" />
    <None Remove="Controls\PasswordStrengthProgressBar\" />
    <None Remove="Utilities\Automation\" />
-    <None Remove="Utilities\Prompts\" />
-    <None Remove="Controls\Settings\" />
  </ItemGroup>
 </Project>
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -91,7 +91,7 @@ namespace Bit.App
                            _messagingService.Send("showDialogResolve", new Tuple<int, bool>(details.DialogId, confirmed));
                        });
                    }
-                    else if (message.Command == AppHelpers.RESUMED_MESSAGE_COMMAND)
+                    else if (message.Command == "resumed")
                    {
                        if (Device.RuntimePlatform == Device.iOS)
                        {
@@ -171,11 +171,6 @@ namespace Bit.App
                                new NavigationPage(new UpdateTempPasswordPage()));
                        });
                    }
-                    else if (message.Command == Constants.ForceSetPassword)
-                    {
-                        await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.Navigation.PushModalAsync(
-                                new NavigationPage(new SetPasswordPage(orgIdentifier: (string)message.Data))));
-                    }
                    else if (message.Command == "syncCompleted")
                    {
                        await _configService.GetAsync(true);
@@ -370,7 +365,7 @@ namespace Bit.App
            await Device.InvokeOnMainThreadAsync(() =>
            {
                ThemeManager.SetTheme(Current.Resources);
-                _messagingService.Send(ThemeManager.UPDATED_THEME_MESSAGE_KEY);
+                _messagingService.Send("updatedTheme");
            });
        }

--- a/src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs
+++ b/src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs
@@ -36,7 +36,7 @@ namespace Bit.App.Controls

        public bool ShowHostname
        {
-            get => !string.IsNullOrWhiteSpace(AccountView.Hostname);
+            get => !string.IsNullOrWhiteSpace(AccountView.Hostname) && AccountView.Hostname != "vault.bitwarden.com";
        }

        public bool IsActive
--- a/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
@@ -31,7 +31,7 @@ namespace Bit.App.Controls
        public bool ShowIconImage
        {
            get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.LaunchUri)
+                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
                && IconImageSource != null;
        }

@@ -41,7 +41,7 @@ namespace Bit.App.Controls
            {
                if (_iconImageSource == string.Empty) // default value since icon source can return null
                {
-                    _iconImageSource = IconImageHelper.GetIconImage(Cipher);
+                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
                }
                return _iconImageSource;
            }
--- a/src/App/Controls/CustomLabel.cs
+++ b/src/App/Controls/CustomLabel.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using System;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -7,7 +8,6 @@ namespace Bit.App.Controls
        public CustomLabel()
        {
        }
+    }
+}

-        public int? FontWeight { get; set; }
-    }
-}
--- a/src/App/Controls/ExternalLinkItemView.xaml
+++ b/src/App/Controls/ExternalLinkItemView.xaml
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentView
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    x:Class="Bit.App.Controls.ExternalLinkItemView"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:Name="_contentView">
-    <ContentView.GestureRecognizers>
-        <TapGestureRecognizer Command="{Binding GoToLinkCommand, Mode=OneWay, Source={x:Reference _contentView}}" />
-    </ContentView.GestureRecognizers>
-    <StackLayout
-        Orientation="Horizontal">
-        <controls:CustomLabel
-            Text="{Binding Title, Mode=OneWay, Source={x:Reference _contentView}}"
-            HorizontalOptions="StartAndExpand"
-            LineBreakMode="TailTruncation" />
-
-        <controls:IconLabel
-            Text="{Binding Source={x:Static core:BitwardenIcons.ShareSquare}}"
-            TextColor="{DynamicResource TextColor}"
-            HorizontalOptions="End"
-            VerticalOptions="Center"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Title, Mode=OneWay, Source={x:Reference _contentView}}" />
-
-    </StackLayout>
-</ContentView>
-
--- a/src/App/Controls/ExternalLinkItemView.xaml.cs
+++ b/src/App/Controls/ExternalLinkItemView.xaml.cs
@@ -1,31 +0,0 @@
-using System.Windows.Input;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class ExternalLinkItemView : ContentView
-    {
-        public static readonly BindableProperty TitleProperty = BindableProperty.Create(
-            nameof(Title), typeof(string), typeof(ExternalLinkItemView), null, BindingMode.OneWay);
-
-        public static readonly BindableProperty GoToLinkCommandProperty = BindableProperty.Create(
-            nameof(GoToLinkCommand), typeof(ICommand), typeof(ExternalLinkItemView));
-
-        public ExternalLinkItemView()
-        {
-            InitializeComponent();
-        }
-
-        public string Title
-        {
-            get { return (string)GetValue(TitleProperty); }
-            set { SetValue(TitleProperty, value); }
-        }
-
-        public ICommand GoToLinkCommand
-        {
-            get => GetValue(GoToLinkCommandProperty) as ICommand;
-            set => SetValue(GoToLinkCommandProperty, value);
-        }
-    }
-}
--- a/src/App/Controls/Settings/BaseSettingControlView.cs
+++ b/src/App/Controls/Settings/BaseSettingControlView.cs
@@ -1,27 +0,0 @@
-using System.Runtime.CompilerServices;
-using Bit.App.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class BaseSettingItemView : ContentView
-    {
-        public static readonly BindableProperty TitleProperty = BindableProperty.Create(
-            nameof(Title), typeof(string), typeof(SwitchItemView), null);
-
-        public static readonly BindableProperty SubtitleProperty = BindableProperty.Create(
-            nameof(Subtitle), typeof(string), typeof(SwitchItemView), null);
-
-        public string Title
-        {
-            get { return (string)GetValue(TitleProperty); }
-            set { SetValue(TitleProperty, value); }
-        }
-
-        public string Subtitle
-        {
-            get { return (string)GetValue(SubtitleProperty); }
-            set { SetValue(SubtitleProperty, value); }
-        }
-    }
-}
--- a/src/App/Controls/Settings/SettingChooserItemView.xaml
+++ b/src/App/Controls/Settings/SettingChooserItemView.xaml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<controls:BaseSettingItemView
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    x:Class="Bit.App.Controls.SettingChooserItemView"
-    x:Name="_contentView"
-    ControlTemplate="{StaticResource SettingControlTemplate}">
-    <controls:BaseSettingItemView.GestureRecognizers>
-        <TapGestureRecognizer Command="{Binding ChooseCommand, Mode=OneWay, Source={x:Reference _contentView}}" />
-    </controls:BaseSettingItemView.GestureRecognizers>
-
-    <controls:CustomLabel
-        Text="{Binding DisplayValue, Source={x:Reference _contentView}}"
-        HorizontalTextAlignment="End"
-        TextColor="{DynamicResource MutedColor}"
-        StyleClass="list-sub" />
-
-</controls:BaseSettingItemView>
--- a/src/App/Controls/Settings/SettingChooserItemView.xaml.cs
+++ b/src/App/Controls/Settings/SettingChooserItemView.xaml.cs
@@ -1,31 +0,0 @@
-using System.Windows.Input;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class SettingChooserItemView : BaseSettingItemView
-    {
-        public static readonly BindableProperty DisplayValueProperty = BindableProperty.Create(
-            nameof(DisplayValue), typeof(string), typeof(SettingChooserItemView), null);
-
-        public static readonly BindableProperty ChooseCommandProperty = BindableProperty.Create(
-            nameof(ChooseCommand), typeof(ICommand), typeof(ExternalLinkItemView));
-
-        public string DisplayValue
-        {
-            get { return (string)GetValue(DisplayValueProperty); }
-            set { SetValue(DisplayValueProperty, value); }
-        }
-
-        public SettingChooserItemView()
-        {
-            InitializeComponent();
-        }
-
-        public ICommand ChooseCommand
-        {
-            get => GetValue(ChooseCommandProperty) as ICommand;
-            set => SetValue(ChooseCommandProperty, value);
-        }
-    }
-}
--- a/src/App/Controls/Settings/SwitchItemView.xaml
+++ b/src/App/Controls/Settings/SwitchItemView.xaml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<controls:BaseSettingItemView
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    x:Class="Bit.App.Controls.SwitchItemView"
-    x:Name="_contentView"
-    ControlTemplate="{StaticResource SettingControlTemplate}">
-    <controls:BaseSettingItemView.GestureRecognizers>
-        <TapGestureRecognizer Tapped="ContentView_Tapped" />
-    </controls:BaseSettingItemView.GestureRecognizers>
-
-    <Switch
-        x:Name="_switch"
-        HeightRequest="20"
-        Scale="{OnPlatform iOS=0.8, Android=1}"
-        IsToggled="{Binding IsToggled, Mode=TwoWay, Source={x:Reference _contentView}}"
-        AutomationId="{Binding SwitchAutomationId, Mode=OneWay, Source={x:Reference _contentView}}"/>
-</controls:BaseSettingItemView>
--- a/src/App/Controls/Settings/SwitchItemView.xaml.cs
+++ b/src/App/Controls/Settings/SwitchItemView.xaml.cs
@@ -1,45 +0,0 @@
-using System.Windows.Input;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class SwitchItemView : BaseSettingItemView
-    {
-        public static readonly BindableProperty IsToggledProperty = BindableProperty.Create(
-            nameof(IsToggled), typeof(bool), typeof(SwitchItemView), null, BindingMode.TwoWay);
-
-        public static readonly BindableProperty SwitchAutomationIdProperty = BindableProperty.Create(
-            nameof(SwitchAutomationId), typeof(string), typeof(SwitchItemView), null, BindingMode.OneWay);
-
-        public static readonly BindableProperty ToggleSwitchCommandProperty = BindableProperty.Create(
-            nameof(ToggleSwitchCommand), typeof(ICommand), typeof(ExternalLinkItemView));
-
-        public SwitchItemView()
-        {
-            InitializeComponent();
-        }
-
-        public bool IsToggled
-        {
-            get { return (bool)GetValue(IsToggledProperty); }
-            set { SetValue(IsToggledProperty, value); }
-        }
-
-        public string SwitchAutomationId
-        {
-            get { return (string)GetValue(SwitchAutomationIdProperty); }
-            set { SetValue(SwitchAutomationIdProperty, value); }
-        }
-
-        public ICommand ToggleSwitchCommand
-        {
-            get => GetValue(ToggleSwitchCommandProperty) as ICommand;
-            set => SetValue(ToggleSwitchCommandProperty, value);
-        }
-
-        void ContentView_Tapped(System.Object sender, System.EventArgs e)
-        {
-            _switch.IsToggled = !_switch.IsToggled;
-        }
-    }
-}
--- a/src/App/Pages/Accounts/EnvironmentPageViewModel.cs
+++ b/src/App/Pages/Accounts/EnvironmentPageViewModel.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
-using Bit.Core.Enums;
+using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;

@@ -19,25 +19,14 @@ namespace Bit.App.Pages
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");

            PageTitle = AppResources.Settings;
-            SubmitCommand = new AsyncCommand(SubmitAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-            Init();
-        }
-
-        public void Init()
-        {
-            if (_environmentService.SelectedRegion != Region.SelfHosted ||
-                _environmentService.BaseUrl == Region.US.BaseUrl() ||
-                _environmentService.BaseUrl == Region.EU.BaseUrl())
-            {
-                return;
-            }
-
-            BaseUrl = _environmentService.BaseUrl;
+            BaseUrl = _environmentService.BaseUrl == EnvironmentUrlData.DefaultEU.Base || EnvironmentUrlData.DefaultUS.Base == _environmentService.BaseUrl ?
+                string.Empty : _environmentService.BaseUrl;
            WebVaultUrl = _environmentService.WebVaultUrl;
            ApiUrl = _environmentService.ApiUrl;
            IdentityUrl = _environmentService.IdentityUrl;
            IconsUrl = _environmentService.IconsUrl;
            NotificationsUrls = _environmentService.NotificationsUrl;
+            SubmitCommand = new AsyncCommand(SubmitAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
        }

        public ICommand SubmitCommand { get; }
@@ -57,7 +46,8 @@ namespace Bit.App.Pages
                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.EnvironmentPageUrlsError, AppResources.Ok);
                return;
            }
-            var urls = new Core.Models.Data.EnvironmentUrlData
+
+            var resUrls = await _environmentService.SetUrlsAsync(new Core.Models.Data.EnvironmentUrlData
            {
                Base = BaseUrl,
                Api = ApiUrl,
@@ -65,8 +55,7 @@ namespace Bit.App.Pages
                WebVault = WebVaultUrl,
                Icons = IconsUrl,
                Notifications = NotificationsUrls
-            };
-            var resUrls = await _environmentService.SetRegionAsync(urls.Region, urls);
+            });

            // re-set urls since service can change them, ex: prefixing https://
            BaseUrl = resUrls.Base;
--- a/src/App/Pages/Accounts/HomePage.xaml.cs
+++ b/src/App/Pages/Accounts/HomePage.xaml.cs
@@ -64,7 +64,7 @@ namespace Bit.App.Pages
            }
            _broadcasterService.Subscribe(nameof(HomePage), (message) =>
            {
-                if (message.Command is ThemeManager.UPDATED_THEME_MESSAGE_KEY)
+                if (message.Command == "updatedTheme")
                {
                    Device.BeginInvokeOnMainThread(() =>
                    {
@@ -74,7 +74,7 @@ namespace Bit.App.Pages
            });
            try
            {
-                await _vm.UpdateEnvironmentAsync();
+                await _vm.UpdateEnvironment();
            }
            catch (Exception ex)
            {
--- a/src/App/Pages/Accounts/HomePageViewModel.cs
+++ b/src/App/Pages/Accounts/HomePageViewModel.cs
@@ -3,21 +3,21 @@ using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
-using Bit.App.Styles;
 using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Data;
+using Bit.Core.Models.Response;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
+using Xamarin.Essentials;
 using Xamarin.Forms;
-using BwRegion = Bit.Core.Enums.Region;

 namespace Bit.App.Pages
 {
    public class HomeViewModel : BaseViewModel
    {
-
        private readonly IStateService _stateService;
        private readonly IMessagingService _messagingService;
        private readonly IPlatformUtilsService _platformUtilsService;
@@ -30,6 +30,8 @@ namespace Bit.App.Pages
        private bool _rememberEmail;
        private string _email;
        private string _selectedEnvironmentName;
+        private bool _isEmailEnabled;
+        private bool _canLogin;
        private bool _displayEuEnvironment;

        public HomeViewModel()
@@ -84,7 +86,7 @@ namespace Bit.App.Pages
            set => SetProperty(ref _selectedEnvironmentName, value);
        }

-        public string RegionText => $"{AppResources.LoggingInOn}:";
+        public string RegionText => $"{AppResources.Region}:";
        public bool CanContinue => !string.IsNullOrEmpty(Email);

        public FormattedString CreateAccountText
@@ -165,12 +167,12 @@ namespace Bit.App.Pages
        {
            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag);
            var options = _displayEuEnvironment
-                    ? new string[] { BwRegion.US.Domain(), BwRegion.EU.Domain(), AppResources.SelfHosted }
-                    : new string[] { BwRegion.US.Domain(), AppResources.SelfHosted };
+                    ? new string[] { AppResources.US, AppResources.EU, AppResources.SelfHosted }
+                    : new string[] { AppResources.US, AppResources.SelfHosted };

            await Device.InvokeOnMainThreadAsync(async () =>
            {
-                var result = await Page.DisplayActionSheet(AppResources.LoggingInOn, AppResources.Cancel, null, options);
+                var result = await Page.DisplayActionSheet(AppResources.DataRegion, AppResources.Cancel, null, options);

                if (result is null || result == AppResources.Cancel)
                {
@@ -183,23 +185,35 @@ namespace Bit.App.Pages
                    return;
                }

-                await _environmentService.SetRegionAsync(result == BwRegion.EU.Domain() ? BwRegion.EU : BwRegion.US);
+                await _environmentService.SetUrlsAsync(result == AppResources.EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
                await _configService.GetAsync(true);
                SelectedEnvironmentName = result;
            });
        }

-        public async Task UpdateEnvironmentAsync()
+        public async Task UpdateEnvironment()
        {
-            var region = _environmentService.SelectedRegion;
-            if (region == BwRegion.SelfHosted)
+            var environmentsSaved = await _stateService.GetPreAuthEnvironmentUrlsAsync();
+            if (environmentsSaved == null || environmentsSaved.IsEmpty)
            {
-                SelectedEnvironmentName = AppResources.SelfHosted;
-                await _configService.GetAsync(true);
+                await _environmentService.SetUrlsAsync(EnvironmentUrlData.DefaultUS);
+                environmentsSaved = EnvironmentUrlData.DefaultUS;
+                SelectedEnvironmentName = AppResources.US;
+                return;
+            }
+
+            if (environmentsSaved.Base == EnvironmentUrlData.DefaultUS.Base)
+            {
+                SelectedEnvironmentName = AppResources.US;
+            }
+            else if (environmentsSaved.Base == EnvironmentUrlData.DefaultEU.Base)
+            {
+                SelectedEnvironmentName = AppResources.EU;
            }
            else
            {
-                SelectedEnvironmentName = region.Domain();
+                await _configService.GetAsync(true);
+                SelectedEnvironmentName = AppResources.SelfHosted;
            }
        }
    }
--- a/src/App/Pages/Accounts/LockPage.xaml
+++ b/src/App/Pages/Accounts/LockPage.xaml
@@ -46,7 +46,7 @@
                    <StackLayout StyleClass="box">
                        <Grid
                            StyleClass="box-row"
-                            IsVisible="{Binding PinEnabled}"
+                            IsVisible="{Binding PinLock}"
                            Padding="0, 10, 0, 0">
                            <Grid.RowDefinitions>
                                <RowDefinition Height="Auto" />
@@ -89,7 +89,7 @@
                        <Grid
                            x:Name="_passwordGrid"
                            StyleClass="box-row"
-                            IsVisible="{Binding PinEnabled, Converter={StaticResource inverseBool}}"
+                            IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}"
                            Padding="0, 10, 0, 0">
                            <Grid.RowDefinitions>
                                <RowDefinition Height="Auto" />
--- a/src/App/Pages/Accounts/LockPage.xaml.cs
+++ b/src/App/Pages/Accounts/LockPage.xaml.cs
@@ -20,14 +20,13 @@ namespace Bit.App.Pages
        private bool _promptedAfterResume;
        private bool _appeared;

-        public LockPage(AppOptions appOptions = null, bool autoPromptBiometric = true, bool checkPendingAuthRequests = true)
+        public LockPage(AppOptions appOptions = null, bool autoPromptBiometric = true)
        {
            _appOptions = appOptions;
            _autoPromptBiometric = autoPromptBiometric;
            InitializeComponent();
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>();
            _vm = BindingContext as LockPageViewModel;
-            _vm.CheckPendingAuthRequests = checkPendingAuthRequests;
            _vm.Page = this;
            _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(async () => await UnlockedAsync());

@@ -45,7 +44,7 @@ namespace Bit.App.Pages
        {
            get
            {
-                if (_vm?.PinEnabled ?? false)
+                if (_vm?.PinLock ?? false)
                {
                    return _pin;
                }
@@ -55,7 +54,7 @@ namespace Bit.App.Pages

        public async Task PromptBiometricAfterResumeAsync()
        {
-            if (_vm.BiometricEnabled)
+            if (_vm.BiometricLock)
            {
                await Task.Delay(500);
                if (!_promptedAfterResume)
@@ -92,13 +91,13 @@ namespace Bit.App.Pages

            _vm.FocusSecretEntry += PerformFocusSecretEntry;

-            if (!_vm.BiometricEnabled)
+            if (!_vm.BiometricLock)
            {
                RequestFocus(SecretEntry);
            }
            else
            {
-                if (!_vm.HasMasterPassword && !_vm.PinEnabled)
+                if (_vm.UsingKeyConnector && !_vm.PinLock)
                {
                    _passwordGrid.IsVisible = false;
                    _unlockButton.IsVisible = false;
--- a/src/App/Pages/Accounts/LockPageViewModel.cs
+++ b/src/App/Pages/Accounts/LockPageViewModel.cs
@@ -7,7 +7,6 @@ using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
 using Bit.Core.Services;
@@ -28,27 +27,27 @@ namespace Bit.App.Pages
        private readonly IEnvironmentService _environmentService;
        private readonly IStateService _stateService;
        private readonly IBiometricService _biometricService;
-        private readonly IUserVerificationService _userVerificationService;
+        private readonly IKeyConnectorService _keyConnectorService;
        private readonly ILogger _logger;
        private readonly IWatchDeviceService _watchDeviceService;
        private readonly WeakEventManager<int?> _secretEntryFocusWeakEventManager = new WeakEventManager<int?>();
        private readonly IPolicyService _policyService;
        private readonly IPasswordGenerationService _passwordGenerationService;
        private IDeviceTrustCryptoService _deviceTrustCryptoService;
-        private readonly ISyncService _syncService;
        private string _email;
        private string _masterPassword;
        private string _pin;
        private bool _showPassword;
-        private PinLockType _pinStatus;
-        private bool _pinEnabled;
-        private bool _biometricEnabled;
+        private bool _pinLock;
+        private bool _biometricLock;
        private bool _biometricIntegrityValid = true;
        private bool _biometricButtonVisible;
-        private bool _hasMasterPassword;
+        private bool _usingKeyConnector;
        private string _biometricButtonText;
        private string _loggedInAsText;
        private string _lockedVerifyText;
+        private bool _isPinProtected;
+        private bool _isPinProtectedWithKey;

        public LockPageViewModel()
        {
@@ -61,20 +60,18 @@ namespace Bit.App.Pages
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
+            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");
            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
            _policyService = ServiceContainer.Resolve<IPolicyService>();
            _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>();
            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
-            _syncService = ServiceContainer.Resolve<ISyncService>();

            PageTitle = AppResources.VerifyMasterPassword;
            TogglePasswordCommand = new Command(TogglePassword);
            SubmitCommand = new Command(async () => await SubmitAsync());

-            AccountSwitchingOverlayViewModel =
-                new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
+            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
            {
                AllowAddAccountRow = true,
                AllowActiveAccountSelection = true
@@ -104,21 +101,21 @@ namespace Bit.App.Pages
                });
        }

-        public bool PinEnabled
+        public bool PinLock
        {
-            get => _pinEnabled;
-            set => SetProperty(ref _pinEnabled, value);
+            get => _pinLock;
+            set => SetProperty(ref _pinLock, value);
        }

-        public bool HasMasterPassword
+        public bool UsingKeyConnector
        {
-            get => _hasMasterPassword;
+            get => _usingKeyConnector;
        }

-        public bool BiometricEnabled
+        public bool BiometricLock
        {
-            get => _biometricEnabled;
-            set => SetProperty(ref _biometricEnabled, value);
+            get => _biometricLock;
+            set => SetProperty(ref _biometricLock, value);
        }

        public bool BiometricIntegrityValid
@@ -151,18 +148,12 @@ namespace Bit.App.Pages
            set => SetProperty(ref _lockedVerifyText, value);
        }

-        public bool CheckPendingAuthRequests { get; set; }
-
        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }

        public Command SubmitCommand { get; }
        public Command TogglePasswordCommand { get; }
-
        public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword
-            ? AppResources.PasswordIsVisibleTapToHide
-            : AppResources.PasswordIsNotVisibleTapToShow;
-
+        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
        public Action UnlockedAction { get; set; }
        public event Action<int?> FocusSecretEntry
        {
@@ -172,33 +163,18 @@ namespace Bit.App.Pages

        public async Task InitAsync()
        {
-            var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
-            if (pendingRequest != null && CheckPendingAuthRequests)
+            (_isPinProtected, _isPinProtectedWithKey) = await _vaultTimeoutService.IsPinLockSetAsync();
+            PinLock = (_isPinProtected && await _stateService.GetPinProtectedKeyAsync() != null) ||
+                      _isPinProtectedWithKey;
+            BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _cryptoService.HasKeyAsync();
+
+            // Users with key connector and without biometric or pin has no MP to unlock with
+            _usingKeyConnector = await _keyConnectorService.GetUsesKeyConnector();
+            if (_usingKeyConnector && !(BiometricLock || PinLock))
            {
                await _vaultTimeoutService.LogOutAsync();
                return;
            }
-
-            _pinStatus = await _vaultTimeoutService.GetPinLockTypeAsync();
-
-            var ephemeralPinSet = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync()
-                ?? await _stateService.GetPinProtectedKeyAsync();
-            PinEnabled = (_pinStatus == PinLockType.Transient && ephemeralPinSet != null) ||
-                _pinStatus == PinLockType.Persistent;
-
-            BiometricEnabled = await IsBiometricsEnabledAsync();
-
-            // Users without MP and without biometric or pin has no MP to unlock with
-            _hasMasterPassword = await _userVerificationService.HasMasterPasswordAsync();
-            if (await _stateService.IsAuthenticatedAsync()
-                 && !_hasMasterPassword
-                 && !BiometricEnabled
-                 && !PinEnabled)
-            {
-                await _vaultTimeoutService.LogOutAsync();
-                return;
-            }
-
            _email = await _stateService.GetEmailAsync();
            if (string.IsNullOrWhiteSpace(_email))
            {
@@ -206,22 +182,33 @@ namespace Bit.App.Pages
                _logger.Exception(new NullReferenceException("Email not found in storage"));
                return;
            }
-
-            LoggedInAsText = string.Format(AppResources.LoggedInAsOn, _email, _environmentService.GetCurrentDomain());
-            if (PinEnabled)
+            var webVault = _environmentService.GetWebVaultUrl(true);
+            if (string.IsNullOrWhiteSpace(webVault))
+            {
+                webVault = "https://bitwarden.com";
+            }
+            var webVaultHostname = CoreHelpers.GetHostname(webVault);
+            LoggedInAsText = string.Format(AppResources.LoggedInAsOn, _email, webVaultHostname);
+            if (PinLock)
            {
                PageTitle = AppResources.VerifyPIN;
                LockedVerifyText = AppResources.VaultLockedPIN;
            }
            else
            {
-                PageTitle = _hasMasterPassword ? AppResources.VerifyMasterPassword : AppResources.UnlockVault;
-                LockedVerifyText = _hasMasterPassword
-                    ? AppResources.VaultLockedMasterPassword
-                    : AppResources.VaultLockedIdentity;
+                if (_usingKeyConnector)
+                {
+                    PageTitle = AppResources.UnlockVault;
+                    LockedVerifyText = AppResources.VaultLockedIdentity;
+                }
+                else
+                {
+                    PageTitle = AppResources.VerifyMasterPassword;
+                    LockedVerifyText = AppResources.VaultLockedMasterPassword;
+                }
            }

-            if (BiometricEnabled)
+            if (BiometricLock)
            {
                BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
                if (!_biometricIntegrityValid)
@@ -237,98 +224,59 @@ namespace Bit.App.Pages
                    BiometricButtonText = supportsFace ? AppResources.UseFaceIDToUnlock :
                        AppResources.UseFingerprintToUnlock;
                }
+
            }
        }

        public async Task SubmitAsync()
        {
-            ShowPassword = false;
-            try
-            {
-                var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
-                if (PinEnabled)
-                {
-                    await UnlockWithPinAsync(kdfConfig);
-                }
-                else
-                {
-                    await UnlockWithMasterPasswordAsync(kdfConfig);
-                }
-
-            }
-            catch (LegacyUserException)
-            {
-                await HandleLegacyUserAsync();
-            }
-        }
-
-        private async Task UnlockWithPinAsync(KdfConfig kdfConfig)
-        {
-            if (PinEnabled && string.IsNullOrWhiteSpace(Pin))
+            if (PinLock && string.IsNullOrWhiteSpace(Pin))
            {
                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
                    string.Format(AppResources.ValidationFieldRequired, AppResources.PIN),
                    AppResources.Ok);
                return;
            }
+            if (!PinLock && string.IsNullOrWhiteSpace(MasterPassword))
+            {
+                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
+                    string.Format(AppResources.ValidationFieldRequired, AppResources.MasterPassword),
+                    AppResources.Ok);
+                return;
+            }

+            ShowPassword = false;
+            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
+
+            if (PinLock)
+            {
                var failed = true;
                try
                {
-                EncString userKeyPin;
-                EncString oldPinProtected;
-                switch (_pinStatus)
+                    if (_isPinProtected)
                    {
-                    case PinLockType.Persistent:
-                        {
-                            userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
-                            var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
-                            oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
-                            break;
-                        }
-                    case PinLockType.Transient:
-                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync();
-                        oldPinProtected = await _stateService.GetPinProtectedKeyAsync();
-                        break;
-                    case PinLockType.Disabled:
-                    default:
-                        throw new Exception("Pin is disabled");
-                }
-
-                UserKey userKey;
-                if (oldPinProtected != null)
-                {
-                    userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
-                        _pinStatus == PinLockType.Transient,
-                        Pin,
-                        _email,
+                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email,
                            kdfConfig,
-                        oldPinProtected
-                    );
-                }
-                else
-                {
-                    userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
-                        Pin,
-                        _email,
-                        kdfConfig,
-                        userKeyPin
-                    );
-                }
-
+                            await _stateService.GetPinProtectedKeyAsync());
+                        var encKey = await _cryptoService.GetEncKeyAsync(key);
                        var protectedPin = await _stateService.GetProtectedPinAsync();
-                var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
-                failed = decryptedPin != Pin;
+                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
+                        failed = decPin != Pin;
                        if (!failed)
                        {
                            Pin = string.Empty;
                            await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                    await SetUserKeyAndContinueAsync(userKey);
+                            await SetKeyAndContinueAsync(key);
                        }
                    }
-            catch (LegacyUserException)
+                    else
                    {
-                throw;
+                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email, kdfConfig);
+                        failed = false;
+                        Pin = string.Empty;
+                        await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+                        await SetKeyAndContinueAsync(key);
+                    }
                }
                catch
                {
@@ -346,38 +294,21 @@ namespace Bit.App.Pages
                        AppResources.AnErrorHasOccurred);
                }
            }
-
-        private async Task UnlockWithMasterPasswordAsync(KdfConfig kdfConfig)
+            else
            {
-            if (!PinEnabled && string.IsNullOrWhiteSpace(MasterPassword))
-            {
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
-                    string.Format(AppResources.ValidationFieldRequired, AppResources.MasterPassword),
-                    AppResources.Ok);
-                return;
-            }
-
-            var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, _email, kdfConfig);
-            if (await _cryptoService.IsLegacyUserAsync(masterKey))
-            {
-                throw new LegacyUserException();
-            }
-
-            var storedKeyHash = await _cryptoService.GetMasterKeyHashAsync();
+                var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdfConfig);
+                var storedKeyHash = await _cryptoService.GetKeyHashAsync();
                var passwordValid = false;
                MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;

                if (storedKeyHash != null)
                {
-                // Offline unlock possible
-                passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, masterKey);
+                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, key);
                }
                else
                {
-                // Online unlock required
                    await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                var keyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey,
-                    HashPurpose.ServerAuthorization);
+                    var keyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
                    var request = new PasswordVerificationRequest();
                    request.MasterPasswordHash = keyHash;

@@ -386,9 +317,8 @@ namespace Bit.App.Pages
                        var response = await _apiService.PostAccountVerifyPasswordAsync(request);
                        enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
                        passwordValid = true;
-                    var localKeyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey,
-                        HashPurpose.LocalAuthorization);
-                    await _cryptoService.SetMasterKeyHashAsync(localKeyHash);
+                        var localKeyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
+                        await _cryptoService.SetKeyHashAsync(localKeyHash);
                    }
                    catch (Exception e)
                    {
@@ -396,9 +326,17 @@ namespace Bit.App.Pages
                    }
                    await _deviceActionService.HideLoadingAsync();
                }
-
                if (passwordValid)
                {
+                    if (_isPinProtected)
+                    {
+                        var protectedPin = await _stateService.GetProtectedPinAsync();
+                        var encKey = await _cryptoService.GetEncKeyAsync(key);
+                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
+                        var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, _email, kdfConfig);
+                        await _stateService.SetPinProtectedKeyAsync(await _cryptoService.EncryptAsync(key.Key, pinKey));
+                    }
+
                    if (await RequirePasswordChangeAsync(enforcedMasterPasswordOptions))
                    {
                        // Save the ForcePasswordResetReason to force a password reset after unlock
@@ -408,13 +346,10 @@ namespace Bit.App.Pages

                    MasterPassword = string.Empty;
                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-
-                var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
-                await _cryptoService.SetMasterKeyAsync(masterKey);
-                await SetUserKeyAndContinueAsync(userKey);
+                    await SetKeyAndContinueAsync(key);

                    // Re-enable biometrics
-                if (BiometricEnabled & !BiometricIntegrityValid)
+                    if (BiometricLock & !BiometricIntegrityValid)
                    {
                        await _biometricService.SetupBiometricAsync();
                    }
@@ -431,6 +366,7 @@ namespace Bit.App.Pages
                        AppResources.AnErrorHasOccurred);
                }
            }
+        }

        /// <summary>
        /// Checks if the master password requires updating to meet the enforced policy requirements
@@ -490,82 +426,49 @@ namespace Bit.App.Pages
        public void TogglePassword()
        {
            ShowPassword = !ShowPassword;
-            var secret = PinEnabled ? Pin : MasterPassword;
-            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length,
-                nameof(FocusSecretEntry));
+            var secret = PinLock ? Pin : MasterPassword;
+            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length, nameof(FocusSecretEntry));
        }

        public async Task PromptBiometricAsync()
-        {
-            try
        {
            BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
            BiometricButtonVisible = BiometricIntegrityValid;
-                if (!BiometricEnabled || !BiometricIntegrityValid)
+            if (!BiometricLock || !BiometricIntegrityValid)
            {
                return;
            }
-
            var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
-                    PinEnabled ? AppResources.PIN : AppResources.MasterPassword,
-                    () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)),
-                    !PinEnabled && !HasMasterPassword);
-
+                PinLock ? AppResources.PIN : AppResources.MasterPassword,
+                () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)));
            await _stateService.SetBiometricLockedAsync(!success);
            if (success)
            {
-                    var userKey = await _cryptoService.GetBiometricUnlockKeyAsync();
-                    await SetUserKeyAndContinueAsync(userKey);
-                }
-            }
-            catch (LegacyUserException)
-            {
-                await HandleLegacyUserAsync();
+                await DoContinueAsync();
            }
        }

-        private async Task SetUserKeyAndContinueAsync(UserKey key)
+        private async Task SetKeyAndContinueAsync(SymmetricCryptoKey key)
        {
-            var hasKey = await _cryptoService.HasUserKeyAsync();
+            var hasKey = await _cryptoService.HasKeyAsync();
            if (!hasKey)
            {
-                await _cryptoService.SetUserKeyAsync(key);
+                await _cryptoService.SetKeyAsync(key);
+            }
+            if (await _deviceTrustCryptoService.GetUserTrustDeviceChoiceForDecryptionAsync())
+            {
+                await _deviceTrustCryptoService.TrustDeviceAsync();
+                await _deviceTrustCryptoService.SetUserTrustDeviceChoiceForDecryptionAsync(false);
            }
-            await _deviceTrustCryptoService.TrustDeviceIfNeededAsync();
            await DoContinueAsync();
        }

        private async Task DoContinueAsync()
        {
-            _syncService.FullSyncAsync(false).FireAndForget();
            await _stateService.SetBiometricLockedAsync(false);
            _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
            _messagingService.Send("unlocked");
            UnlockedAction?.Invoke();
        }
-
-        private async Task<bool> IsBiometricsEnabledAsync()
-        {
-            try
-            {
-                return await _vaultTimeoutService.IsBiometricLockSetAsync() &&
-                   await _biometricService.CanUseBiometricsUnlockAsync();
-            }
-            catch (LegacyUserException)
-            {
-                await HandleLegacyUserAsync();
-            }
-            return false;
-        }
-
-        private async Task HandleLegacyUserAsync()
-        {
-            // Legacy users must migrate on web vault.
-            await _platformUtilsService.ShowDialogAsync(AppResources.EncryptionKeyMigrationRequiredDescriptionLong,
-                AppResources.AnErrorHasOccurred,
-                AppResources.Ok);
-            await _vaultTimeoutService.LogOutAsync();
-        }
-
    }
 }
--- a/src/App/Pages/Accounts/LoginApproveDevicePage.xaml
+++ b/src/App/Pages/Accounts/LoginApproveDevicePage.xaml
@@ -26,7 +26,6 @@
            <Switch
                Scale="0.8"
                IsToggled="{Binding RememberThisDevice}"
-                AutomationId="RememberThisDeviceSwitch"
                VerticalOptions="Center"/>
        </StackLayout>
        <StackLayout Margin="0, 20, 0, 0">
@@ -35,34 +34,31 @@
                Text="{u:I18n Continue}" 
                StyleClass="btn-primary"
                Command="{Binding ContinueCommand}"
-                IsVisible="{Binding IsNewUser}"
-                AutomationId="ContinueButton" />
+                IsVisible="{Binding ContinueEnabled}"/>
            <Button
                x:Name="_approveWithMyOtherDevice"
                Text="{u:I18n ApproveWithMyOtherDevice}" 
                StyleClass="btn-primary"
                Command="{Binding ApproveWithMyOtherDeviceCommand}"
-                IsVisible="{Binding ApproveWithMyOtherDeviceEnabled}"
-                AutomationId="ApproveWithMyOtherDeviceButton" />
+                IsVisible="{Binding ApproveWithMyOtherDeviceEnabled}"/>
            <Button
                x:Name="_requestAdminApproval"
                Text="{u:I18n RequestAdminApproval}" 
                StyleClass="box-button-row"
                Command="{Binding RequestAdminApprovalCommand}"
-                IsVisible="{Binding RequestAdminApprovalEnabled}"
-                AutomationId="RequestAdminApprovalButton" />
+                IsVisible="{Binding RequestAdminApprovalEnabled}"/>
            <Button
                x:Name="_approveWithMasterPassword"
                Text="{u:I18n ApproveWithMasterPassword}" 
                StyleClass="box-button-row"
                Command="{Binding ApproveWithMasterPasswordCommand}"
-                IsVisible="{Binding ApproveWithMasterPasswordEnabled}"
-                AutomationId="ApproveWithMasterPasswordButton" />
+                IsVisible="{Binding ApproveWithMasterPasswordEnabled}"/>
            <Label
                Text="{Binding LoggingInAsText}"
                StyleClass="text-sm"
                Margin="0,40,0,0"
-                AutomationId="LoggingInAsLabel" />
+                AutomationId="LoggingInAsLabel"
+                />
            <Label
                Text="{u:I18n NotYou}"
                StyleClass="text-md"
@@ -70,7 +66,7 @@
                TextColor="{DynamicResource HyperlinkColor}"
                AutomationId="NotYouLabel">
                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding LogoutCommand}" />
+                    <TapGestureRecognizer Tapped="Cancel_Clicked" />
                </Label.GestureRecognizers>
            </Label>
        </StackLayout>
--- a/src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs
@@ -19,10 +19,10 @@ namespace Bit.App.Pages
        {
            InitializeComponent();
            _vm = BindingContext as LoginApproveDeviceViewModel;
-            _vm.LogInWithMasterPasswordAction = () => StartLogInWithMasterPasswordAsync().FireAndForget();
+            _vm.LogInWithMasterPassword = () => StartLogInWithMasterPassword().FireAndForget();
            _vm.LogInWithDeviceAction = () => StartLoginWithDeviceAsync().FireAndForget();
            _vm.RequestAdminApprovalAction = () => RequestAdminApprovalAsync().FireAndForget();
-            _vm.ContinueToVaultAction = () => ContinueToVaultAsync().FireAndForget();
+            _vm.CloseAction = () => { Navigation.PopModalAsync(); };
            _vm.Page = this;
            _appOptions = appOptions;
        }
@@ -32,31 +32,29 @@ namespace Bit.App.Pages
            _vm.InitAsync();
        }

-        private async Task ContinueToVaultAsync()
+        private void Cancel_Clicked(object sender, EventArgs e)
        {
-            if (AppHelpers.SetAlternateMainPage(_appOptions))
+            if (DoOnce())
            {
-                return;
+                _vm.CloseAction();
            }
-            var previousPage = await AppHelpers.ClearPreviousPage();
-            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
        }

-        private async Task StartLogInWithMasterPasswordAsync()
+        private async Task StartLogInWithMasterPassword()
        {
-            var page = new LockPage(_appOptions, checkPendingAuthRequests: false);
+            var page = new LockPage(_appOptions);
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

        private async Task StartLoginWithDeviceAsync()
        {
-            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AuthenticateAndUnlock, _appOptions, true);
+            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AuthenticateAndUnlock, _appOptions);
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

        private async Task RequestAdminApprovalAsync()
        {
-            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AdminApproval, _appOptions, true);
+            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AdminApproval, _appOptions);
            await Navigation.PushModalAsync(new NavigationPage(page));
        }
    }
--- a/src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs
+++ b/src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Abstractions;
@@ -7,7 +6,6 @@ using Bit.App.Resources;
 using Bit.App.Utilities.AccountManagement;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
@@ -23,54 +21,45 @@ namespace Bit.App.Pages
        private bool _approveWithMyOtherDeviceEnabled;
        private bool _requestAdminApprovalEnabled;
        private bool _approveWithMasterPasswordEnabled;
+        private bool _continueEnabled;
        private string _email;
        private readonly IStateService _stateService;
        private readonly IApiService _apiService;
        private IDeviceTrustCryptoService _deviceTrustCryptoService;
-        private readonly IAuthService _authService;
-        private readonly ISyncService _syncService;
-        private readonly IMessagingService _messagingService;

        public ICommand ApproveWithMyOtherDeviceCommand { get; }
        public ICommand RequestAdminApprovalCommand { get; }
        public ICommand ApproveWithMasterPasswordCommand { get; }
        public ICommand ContinueCommand { get; }
-        public ICommand LogoutCommand { get; }

-        public Action LogInWithMasterPasswordAction { get; set; }
+        public Action LogInWithMasterPassword { get; set; }
        public Action LogInWithDeviceAction { get; set; }
        public Action RequestAdminApprovalAction { get; set; }
-        public Action ContinueToVaultAction { get; set; }
+        public Action CloseAction { get; set; }

        public LoginApproveDeviceViewModel()
        {
            _stateService = ServiceContainer.Resolve<IStateService>();
            _apiService = ServiceContainer.Resolve<IApiService>();
            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
-            _authService = ServiceContainer.Resolve<IAuthService>();
-            _syncService = ServiceContainer.Resolve<ISyncService>();
-            _messagingService = ServiceContainer.Resolve<IMessagingService>();

-            PageTitle = AppResources.LogInInitiated;
-            RememberThisDevice = true;
+            PageTitle = AppResources.LoggedIn;

-            ApproveWithMyOtherDeviceCommand = new AsyncCommand(() => SetDeviceTrustAndInvokeAsync(LogInWithDeviceAction),
+            ApproveWithMyOtherDeviceCommand = new AsyncCommand(() => CheckDeviceTrustAndInvoke(LogInWithDeviceAction),
                onException: ex => HandleException(ex),
                allowsMultipleExecutions: false);

-            RequestAdminApprovalCommand = new AsyncCommand(() => SetDeviceTrustAndInvokeAsync(RequestAdminApprovalAction),
+            RequestAdminApprovalCommand = new AsyncCommand(() => CheckDeviceTrustAndInvoke(RequestAdminApprovalAction),
                onException: ex => HandleException(ex),
                allowsMultipleExecutions: false);

-            ApproveWithMasterPasswordCommand = new AsyncCommand(() => SetDeviceTrustAndInvokeAsync(LogInWithMasterPasswordAction),
+            ApproveWithMasterPasswordCommand = new AsyncCommand(() => CheckDeviceTrustAndInvoke(LogInWithMasterPassword),
                onException: ex => HandleException(ex),
                allowsMultipleExecutions: false);

-            ContinueCommand = new AsyncCommand(CreateNewSsoUserAsync,
+            ContinueCommand = new AsyncCommand(InitAsync,
                onException: ex => HandleException(ex),
                allowsMultipleExecutions: false);
-
-            LogoutCommand = new Command(() => _messagingService.Send(AccountsManagerMessageCommands.LOGOUT));
        }

        public string LoggingInAsText => string.Format(AppResources.LoggingInAsX, Email);
@@ -90,18 +79,20 @@ namespace Bit.App.Pages
        public bool RequestAdminApprovalEnabled
        {
            get => _requestAdminApprovalEnabled;
-            set => SetProperty(ref _requestAdminApprovalEnabled, value,
-                additionalPropertyNames: new[] { nameof(IsNewUser) });
+            set => SetProperty(ref _requestAdminApprovalEnabled, value);
        }

        public bool ApproveWithMasterPasswordEnabled
        {
            get => _approveWithMasterPasswordEnabled;
-            set => SetProperty(ref _approveWithMasterPasswordEnabled, value,
-                additionalPropertyNames: new[] { nameof(IsNewUser) });
+            set => SetProperty(ref _approveWithMasterPasswordEnabled, value);
        }

-        public bool IsNewUser => !RequestAdminApprovalEnabled && !ApproveWithMasterPasswordEnabled;
+        public bool ContinueEnabled
+        {
+            get => _continueEnabled;
+            set => SetProperty(ref _continueEnabled, value);
+        }

        public string Email
        {
@@ -116,33 +107,32 @@ namespace Bit.App.Pages
        {
            try
            {
-                Email = await _stateService.GetActiveUserEmailAsync();
+                Email = await _stateService.GetRememberedEmailAsync();
                var decryptOptions = await _stateService.GetAccountDecryptionOptions();
-                RequestAdminApprovalEnabled = decryptOptions?.TrustedDeviceOption?.HasAdminApproval ?? false;
-                ApproveWithMasterPasswordEnabled = decryptOptions?.HasMasterPassword ?? false;
-                ApproveWithMyOtherDeviceEnabled = decryptOptions?.TrustedDeviceOption?.HasLoginApprovingDevice ?? false;
+                RequestAdminApprovalEnabled = decryptOptions != null && decryptOptions.TrustedDeviceOption != null && decryptOptions.TrustedDeviceOption.HasAdminApproval;
+                ApproveWithMasterPasswordEnabled = decryptOptions != null && decryptOptions.HasMasterPassword;
            }
            catch (Exception ex)
            {
                HandleException(ex);
            }
+
+            try
+            {
+                ApproveWithMyOtherDeviceEnabled = await _apiService.GetDevicesExistenceByTypes(DeviceTypeExtensions.GetDesktopAndMobileTypes().ToArray());
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
            }

-        public async Task CreateNewSsoUserAsync()
-        {
-            await _authService.CreateNewSsoUserAsync(await _stateService.GetRememberedOrgIdentifierAsync());
-            if (RememberThisDevice)
-            {
-                await _deviceTrustCryptoService.TrustDeviceAsync();
+            // TODO: Change this expression to, Appear if the browser is trusted and shared the key with the app
+            ContinueEnabled = !RequestAdminApprovalEnabled && !ApproveWithMasterPasswordEnabled && !ApproveWithMyOtherDeviceEnabled;
        }

-            _syncService.FullSyncAsync(true).FireAndForget();
-            await Device.InvokeOnMainThreadAsync(ContinueToVaultAction);
-        }
-
-        private async Task SetDeviceTrustAndInvokeAsync(Action action)
+        private async Task CheckDeviceTrustAndInvoke(Action action)
        {
-            await _deviceTrustCryptoService.SetShouldTrustDeviceAsync(RememberThisDevice);
+            await _deviceTrustCryptoService.SetUserTrustDeviceChoiceForDecryptionAsync(RememberThisDevice);
            await Device.InvokeOnMainThreadAsync(action);
        }
    }
--- a/src/App/Pages/Accounts/LoginPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPageViewModel.cs
@@ -162,7 +162,7 @@ namespace Bit.App.Pages
                    Email = await _stateService.GetRememberedEmailAsync();
                }
                CanRemoveAccount = await _stateService.GetActiveUserEmailAsync() != Email;
-                EnvironmentDomainName = _environmentService.GetCurrentDomain();
+                EnvironmentDomainName = CoreHelpers.GetDomain((await _stateService.GetPreAuthEnvironmentUrlsAsync())?.Base);
                IsKnownDevice = await _apiService.GetKnownDeviceAsync(Email, await _appIdService.GetAppIdAsync());
            }
            catch (ApiException apiEx) when (apiEx.Error.StatusCode == System.Net.HttpStatusCode.Unauthorized)
@@ -248,14 +248,6 @@ namespace Bit.App.Pages

                await _deviceActionService.HideLoadingAsync();

-                if (response.RequiresEncryptionKeyMigration)
-                {
-                    // Legacy users must migrate on web vault.
-                    await _platformUtilsService.ShowDialogAsync(AppResources.EncryptionKeyMigrationRequiredDescriptionLong, AppResources.AnErrorHasOccurred,
-                        AppResources.Ok);
-                    return;
-                }
-
                if (response.TwoFactor)
                {
                    StartTwoFactorAction?.Invoke();
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
@@ -21,54 +21,53 @@
        <StackLayout
            Padding="7, 0, 7, 20">
            <Label
-                Text="{Binding Title}"
+                Text="{Binding Tittle}"
                FontSize="Title"
                FontAttributes="Bold"
                Margin="0,14,0,21"
                AutomationId="LogInInitiatedLabel" />
            <Label
-                Text="{Binding SubTitle}"
+                Text="{Binding SubTittle}"
                FontSize="Small"
-                Margin="0,0,0,10"
-                AutomationId="SubTitleLabel" />
+                Margin="0,0,0,10"/>
            <Label
                Text="{Binding Description}"
                FontSize="Small"
-                Margin="0,0,0,24"
-                AutomationId="DescriptionLabel" />
+                Margin="0,0,0,24"/>
            <Label
                Text="{u:I18n FingerprintPhrase}"
                FontSize="Small"
                FontAttributes="Bold"/>
            <controls:MonoLabel
                FormattedText="{Binding FingerprintPhrase}"
-                FontSize="Small"
+                FontSize="Medium"
                TextColor="{DynamicResource FingerprintPhrase}"
                AutomationId="FingerprintPhraseValue" />
            <Label
                Text="{u:I18n ResendNotification}"
                IsVisible="{Binding ResendNotificationVisible}"
-                StyleClass="text-sm"
-                FontAttributes="Bold"
+                StyleClass="text-md"
                HorizontalOptions="Start"
-                Margin="0,24,0,0"
+                Margin="0,40,0,0"
                TextColor="{DynamicResource HyperlinkColor}"
                AutomationId="ResendNotificationButton">
                <Label.GestureRecognizers>
                    <TapGestureRecognizer Command="{Binding CreatePasswordlessLoginCommand}" />
                </Label.GestureRecognizers>
            </Label>
-            <BoxView
-                HeightRequest="1"
-                Margin="0,24,0,24"
-                Color="{DynamicResource DisabledIconColor}" />
+            <StackLayout
+                Orientation="Horizontal"
+                Margin="0,30,0,0">
                <Label
                    Text="{Binding OtherOptions}"
-                FontSize="Small" />
+                    FontSize="Small"
+                    VerticalTextAlignment="End"/>
                <Label
                    Text="{u:I18n ViewAllLoginOptions}"
-                StyleClass="text-sm"
-                FontAttributes="Bold"
+                    StyleClass="text-md"
+                    VerticalTextAlignment="End"
+                    VerticalOptions="CenterAndExpand"
+                    Margin="5, 0"
                    TextColor="{DynamicResource HyperlinkColor}"
                    AutomationId="ViewAllLoginOptionsButton">
                    <Label.GestureRecognizers>
@@ -76,5 +75,7 @@
                    </Label.GestureRecognizers>
                </Label>
            </StackLayout>
+               
+        </StackLayout>
    </ScrollView>
 </pages:BaseContentPage>
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
@@ -13,7 +13,7 @@ namespace Bit.App.Pages
        private LoginPasswordlessRequestViewModel _vm;
        private readonly AppOptions _appOptions;

-        public LoginPasswordlessRequestPage(string email, AuthRequestType authRequestType, AppOptions appOptions = null, bool authingWithSso = false)
+        public LoginPasswordlessRequestPage(string email, AuthRequestType authRequestType, AppOptions appOptions = null)
        {
            InitializeComponent();
            _appOptions = appOptions;
@@ -21,7 +21,6 @@ namespace Bit.App.Pages
            _vm.Page = this;
            _vm.Email = email;
            _vm.AuthRequestType = authRequestType;
-            _vm.AuthingWithSso = authingWithSso;
            _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
            _vm.LogInSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await LogInSuccessAsync());
            _vm.UpdateTempPasswordAction = () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs
@@ -12,9 +12,7 @@ using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
-using Bit.Core.Models.Response;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -36,8 +34,6 @@ namespace Bit.App.Pages
        private IEnvironmentService _environmentService;
        private ILogger _logger;
        private IDeviceTrustCryptoService _deviceTrustCryptoService;
-        private readonly ICryptoFunctionService _cryptoFunctionService;
-        private readonly ICryptoService _cryptoService;

        protected override II18nService i18nService => _i18nService;
        protected override IEnvironmentService environmentService => _environmentService;
@@ -65,8 +61,8 @@ namespace Bit.App.Pages
            _stateService = ServiceContainer.Resolve<IStateService>();
            _logger = ServiceContainer.Resolve<ILogger>();
            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
-            _cryptoFunctionService = ServiceContainer.Resolve<ICryptoFunctionService>();
-            _cryptoService = ServiceContainer.Resolve<ICryptoService>();
+
+            PageTitle = AppResources.LogInWithAnotherDevice;

            CreatePasswordlessLoginCommand = new AsyncCommand(CreatePasswordlessLoginAsync,
                onException: ex => HandleException(ex),
@@ -81,28 +77,11 @@ namespace Bit.App.Pages
        public Action LogInSuccessAction { get; set; }
        public Action UpdateTempPasswordAction { get; set; }
        public Action CloseAction { get; set; }
-        public bool AuthingWithSso { get; set; }

        public ICommand CreatePasswordlessLoginCommand { get; }
        public ICommand CloseCommand { get; }

-        public string HeaderTitle
-        {
-            get
-            {
-                switch (_authRequestType)
-                {
-                    case AuthRequestType.AuthenticateAndUnlock:
-                        return AppResources.LogInWithDevice;
-                    case AuthRequestType.AdminApproval:
-                        return AppResources.LogInInitiated;
-                    default:
-                        return string.Empty;
-                };
-            }
-        }
-
-        public string Title
+        public string Tittle
        {
            get
            {
@@ -118,7 +97,7 @@ namespace Bit.App.Pages
            }
        }

-        public string SubTitle
+        public string SubTittle
        {
            get
            {
@@ -157,7 +136,7 @@ namespace Bit.App.Pages
                switch (_authRequestType)
                {
                    case AuthRequestType.AuthenticateAndUnlock:
-                        return AppResources.LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption;
+                        return AppResources.NeedAnotherOption;
                    case AuthRequestType.AdminApproval:
                        return AppResources.TroubleLoggingIn;
                    default:
@@ -181,18 +160,14 @@ namespace Bit.App.Pages
        public AuthRequestType AuthRequestType
        {
            get => _authRequestType;
-            set
+            set => SetProperty(ref _authRequestType, value, additionalPropertyNames: new string[]
            {
-                SetProperty(ref _authRequestType, value, additionalPropertyNames: new string[]
-                {
-                    nameof(Title),
-                    nameof(SubTitle),
+                nameof(Tittle),
+                nameof(SubTittle),
                nameof(Description),
                nameof(OtherOptions),
                nameof(ResendNotificationVisible)
            });
-                PageTitle = HeaderTitle;
-            }
        }

        public bool ResendNotificationVisible => AuthRequestType == AuthRequestType.AuthenticateAndUnlock;
@@ -227,39 +202,25 @@ namespace Bit.App.Pages

        private async Task CheckLoginRequestStatus()
        {
-            if (string.IsNullOrEmpty(_requestId))
+            if (string.IsNullOrEmpty(_requestId) || string.IsNullOrEmpty(_requestAccessCode))
            {
                return;
            }

            try
            {
-                PasswordlessLoginResponse response = null;
-                if (AuthingWithSso)
-                {
-                    response = await _authService.GetPasswordlessLoginRequestByIdAsync(_requestId);
-                }
-                else
-                {
-                    response = await _authService.GetPasswordlessLoginResquestAsync(_requestId, _requestAccessCode);
-                }
+                var response = await _authService.GetPasswordlessLoginResponseAsync(_requestId, _requestAccessCode);

-                if (response?.RequestApproved != true)
+                if (response.RequestApproved == null || !response.RequestApproved.Value)
                {
                    return;
                }

                StopCheckLoginRequestStatus();

-                var authResult = await _authService.LogInPasswordlessAsync(AuthingWithSso, Email, _requestAccessCode, _requestId, _requestKeyPair.Item2, response.Key, response.MasterPasswordHash);
+                var authResult = await _authService.LogInPasswordlessAsync(Email, _requestAccessCode, _requestId, _requestKeyPair.Item2, response.Key, response.MasterPasswordHash);
                await AppHelpers.ResetInvalidUnlockAttemptsAsync();

-                if (authResult == null && await _stateService.IsAuthenticatedAsync())
-                {
-                    await HandleLoginCompleteAsync();
-                    return;
-                }
-
                if (await HandleCaptchaAsync(authResult.CaptchaSiteKey, authResult.CaptchaNeeded, CheckLoginRequestStatus))
                {
                    return;
@@ -275,12 +236,14 @@ namespace Bit.App.Pages
                }
                else
                {
-                    await HandleLoginCompleteAsync();
-                }
-            }
-            catch (ApiException ex) when (ex.Error?.StatusCode == System.Net.HttpStatusCode.BadRequest)
+                    _syncService.FullSyncAsync(true).FireAndForget();
+                    if (await _deviceTrustCryptoService.GetUserTrustDeviceChoiceForDecryptionAsync())
                    {
-                HandleException(ex);
+                        await _deviceTrustCryptoService.TrustDeviceAsync();
+                        await _deviceTrustCryptoService.SetUserTrustDeviceChoiceForDecryptionAsync(false);
+                    }
+                    LogInSuccessAction?.Invoke();
+                }
            }
            catch (Exception ex)
            {
@@ -289,66 +252,31 @@ namespace Bit.App.Pages
            }
        }

-        private async Task HandleLoginCompleteAsync()
-        {
-            await _stateService.SetPendingAdminAuthRequestAsync(null);
-            _syncService.FullSyncAsync(true).FireAndForget();
-            LogInSuccessAction?.Invoke();
-        }
-
        private async Task CreatePasswordlessLoginAsync()
        {
            await Device.InvokeOnMainThreadAsync(() => _deviceActionService.ShowLoadingAsync(AppResources.Loading));

-            PasswordlessLoginResponse response = null;
-            var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
-            if (pendingRequest != null && _authRequestType == AuthRequestType.AdminApproval)
+            var response = await _authService.PasswordlessCreateLoginRequestAsync(_email, AuthRequestType);
+            if (response != null)
            {
-                response = await _authService.GetPasswordlessLoginRequestByIdAsync(pendingRequest.Id);
-                if (response == null || (response.IsAnswered && !response.RequestApproved.Value))
-                {
-                    // handle pending auth request not valid remove it from state
-                    await _stateService.SetPendingAdminAuthRequestAsync(null);
-                    pendingRequest = null;
-                    response = null;
-                }
-                else
-                {
-                    // Derive pubKey from privKey in state to avoid MITM attacks
-                    // Also generate FingerprintPhrase locally for the same reason
-                    var derivedPublicKey = await _cryptoFunctionService.RsaExtractPublicKeyAsync(pendingRequest.PrivateKey);
-                    response.FingerprintPhrase = string.Join("-", await _cryptoService.GetFingerprintAsync(Email, derivedPublicKey));
-                    response.RequestKeyPair = new Tuple<byte[], byte[]>(derivedPublicKey, pendingRequest.PrivateKey);
-                }
-            }
-
-            if (response == null)
-            {
-                response = await _authService.PasswordlessCreateLoginRequestAsync(_email, AuthRequestType);
-            }
-
-            await HandlePasswordlessLoginAsync(response, pendingRequest == null && _authRequestType == AuthRequestType.AdminApproval);
-            await _deviceActionService.HideLoadingAsync();
-        }
-
-        private async Task HandlePasswordlessLoginAsync(PasswordlessLoginResponse response, bool createPendingAdminRequest)
-        {
-            if (response == null)
-            {
-                throw new ArgumentNullException(nameof(response));
-            }
-
-            if (createPendingAdminRequest)
-            {
-                var pendingAuthRequest = new PendingAdminAuthRequest { Id = response.Id, PrivateKey = response.RequestKeyPair.Item2 };
-                await _stateService.SetPendingAdminAuthRequestAsync(pendingAuthRequest);
-            }
-
                FingerprintPhrase = response.FingerprintPhrase;
                _requestId = response.Id;
                _requestAccessCode = response.RequestAccessCode;
                _requestKeyPair = response.RequestKeyPair;
            }
+
+            await _deviceActionService.HideLoadingAsync();
+        }
+
+        private void HandleException(Exception ex)
+        {
+            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
+            {
+                await _deviceActionService.HideLoadingAsync();
+                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
+            }).FireAndForget();
+            _logger.Exception(ex);
+        }
    }
 }

--- a/src/App/Pages/Accounts/LoginSsoPage.xaml
+++ b/src/App/Pages/Accounts/LoginSsoPage.xaml
@@ -21,7 +21,7 @@
            <StackLayout StyleClass="box">
                <Label Text="{u:I18n LogInSsoSummary}"
                   StyleClass="text-md"
-                   HorizontalTextAlignment="Start" />
+                   HorizontalTextAlignment="Start"></Label>
                <StackLayout StyleClass="box-row">
                    <Label
                        Text="{u:I18n OrgIdentifier}"
@@ -32,15 +32,13 @@
                        Keyboard="Default"
                        StyleClass="box-value" 
                        ReturnType="Go"
-                        ReturnCommand="{Binding LogInCommand}" 
-                        AutomationId="OrgIdentifierEntry" />
+                        ReturnCommand="{Binding LogInCommand}" />
                </StackLayout>
            </StackLayout>
            <StackLayout Padding="10, 0">
                <Button Text="{u:I18n LogIn}"
                        StyleClass="btn-primary"
-                        Clicked="LogIn_Clicked"
-                        AutomationId="LogInButton" />
+                        Clicked="LogIn_Clicked"></Button>
            </StackLayout>
        </StackLayout>
    </ScrollView>
--- a/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
@@ -29,8 +29,6 @@ namespace Bit.App.Pages
            _vm.SsoAuthSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await SsoAuthSuccessAsync());
            _vm.UpdateTempPasswordAction =
                () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
-            _vm.StartDeviceApprovalOptionsAction =
-                () => Device.BeginInvokeOnMainThread(async () => await StartDeviceApprovalOptionsAsync());
            _vm.CloseAction = async () =>
            {
                await Navigation.PopModalAsync();
@@ -108,17 +106,15 @@ namespace Bit.App.Pages
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

-        private async Task StartDeviceApprovalOptionsAsync()
-        {
-            var page = new LoginApproveDevicePage();
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
        private async Task SsoAuthSuccessAsync()
        {
            RestoreAppOptionsFromCopy();
            await AppHelpers.ClearPreviousPage();

+            // Just for testing the screen
+            Application.Current.MainPage = new NavigationPage(new LoginApproveDevicePage(_appOptions));
+            return;
+
            if (await _vaultTimeoutService.IsLockedAsync())
            {
                Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
--- a/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
@@ -9,7 +9,6 @@ using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Essentials;
@@ -30,11 +29,8 @@ namespace Bit.App.Pages
        private readonly IStateService _stateService;
        private readonly ILogger _logger;
        private readonly IOrganizationService _organizationService;
-        private readonly IDeviceTrustCryptoService _deviceTrustCryptoService;
-        private readonly ICryptoService _cryptoService;

        private string _orgIdentifier;
-        private bool _useEphemeralWebBrowserSession;

        public LoginSsoPageViewModel()
        {
@@ -49,8 +45,7 @@ namespace Bit.App.Pages
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");
            _organizationService = ServiceContainer.Resolve<IOrganizationService>();
-            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
-            _cryptoService = ServiceContainer.Resolve<ICryptoService>();
+

            PageTitle = AppResources.Bitwarden;
            LogInCommand = new AsyncCommand(LogInAsync, allowsMultipleExecutions: false);
@@ -66,7 +61,6 @@ namespace Bit.App.Pages
        public Action StartTwoFactorAction { get; set; }
        public Action StartSetPasswordAction { get; set; }
        public Action SsoAuthSuccessAction { get; set; }
-        public Action StartDeviceApprovalOptionsAction { get; set; }
        public Action CloseAction { get; set; }
        public Action UpdateTempPasswordAction { get; set; }

@@ -115,7 +109,7 @@ namespace Bit.App.Pages

                await _deviceActionService.ShowLoadingAsync(AppResources.LoggingIn);

-                var response = await _apiService.PreValidateSsoAsync(OrgIdentifier);
+                var response = await _apiService.PreValidateSso(OrgIdentifier);

                if (string.IsNullOrWhiteSpace(response?.Token))
                {
@@ -146,12 +140,10 @@ namespace Bit.App.Pages
                          "ssoToken=" + Uri.EscapeDataString(ssoToken);

                WebAuthenticatorResult authResult = null;
-                authResult = await WebAuthenticator.AuthenticateAsync(new WebAuthenticatorOptions()
-                {
-                    CallbackUrl = new Uri(REDIRECT_URI),
-                    Url = new Uri(url),
-                    PrefersEphemeralWebBrowserSession = _useEphemeralWebBrowserSession,
-                });
+
+                authResult = await WebAuthenticator.AuthenticateAsync(new Uri(url),
+                    new Uri(REDIRECT_URI));
+

                var code = GetResultCode(authResult, state);
                if (!string.IsNullOrEmpty(code))
@@ -176,8 +168,6 @@ namespace Bit.App.Pages
            {
                // user canceled
                await _deviceActionService.HideLoadingAsync();
-                // Workaroung for cached expired sso token PM-3551 
-                _useEphemeralWebBrowserSession = true;
            }
            catch (Exception ex)
            {
@@ -207,92 +197,28 @@ namespace Bit.App.Pages
            try
            {
                var response = await _authService.LogInSsoAsync(code, codeVerifier, REDIRECT_URI, orgId);
-                var decryptOptions = await _stateService.GetAccountDecryptionOptions();
                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                await _stateService.SetRememberedOrgIdentifierAsync(OrgIdentifier);
                await _deviceActionService.HideLoadingAsync();
                if (response.TwoFactor)
                {
                    StartTwoFactorAction?.Invoke();
-                    return;
                }
-
-                // Trusted device option is sent regardless if this is a trusted device or not
-                // If it is trusted, it will have the necessary keys
-                if (decryptOptions?.TrustedDeviceOption != null)
+                else if (response.ResetMasterPassword)
                {
-                    if (await _deviceTrustCryptoService.IsDeviceTrustedAsync())
-                    {
-                        // If we have a device key but no keys on server, we need to remove the device key
-                        if (decryptOptions.TrustedDeviceOption.EncryptedPrivateKey == null && decryptOptions.TrustedDeviceOption.EncryptedUserKey == null)
-                        {
-                            await _deviceTrustCryptoService.RemoveTrustedDeviceAsync();
-                            StartDeviceApprovalOptionsAction?.Invoke();
-                            return;
+                    StartSetPasswordAction?.Invoke();
                }
-                        // Update temp password only if the device is trusted and therefore has a decrypted User Key set
-                        if (response.ForcePasswordReset)
+                else if (response.ForcePasswordReset)
                {
                    UpdateTempPasswordAction?.Invoke();
-                            return;
-                        }
-                        // If user doesn't have a MP, but has reset password permission, they must set a MP
-                        if (!decryptOptions.HasMasterPassword &&
-                            decryptOptions.TrustedDeviceOption.HasManageResetPasswordPermission)
-                        {
-                            await _stateService.SetForcePasswordResetReasonAsync(ForcePasswordResetReason.TdeUserWithoutPasswordHasPasswordResetPermission);
-                        }
-                        // Device is trusted and has keys, so we can decrypt
-                        _syncService.FullSyncAsync(true).FireAndForget();
-                        SsoAuthSuccessAction?.Invoke();
-                        return;
-                    }
-
-                    // Check for pending Admin Auth requests before navigating to device approval options
-                    var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
-                    if (pendingRequest != null)
-                    {
-                        var authRequest = await _authService.GetPasswordlessLoginRequestByIdAsync(pendingRequest.Id);
-                        if (authRequest?.RequestApproved == true)
-                        {
-                            var authResult = await _authService.LogInPasswordlessAsync(true, await _stateService.GetActiveUserEmailAsync(), authRequest.RequestAccessCode, pendingRequest.Id, pendingRequest.PrivateKey, authRequest.Key, authRequest.MasterPasswordHash);
-                            if (authResult == null && await _stateService.IsAuthenticatedAsync())
-                            {
-                                await Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(
-                                 () => _platformUtilsService.ShowToast("info", null, AppResources.LoginApproved));
-                                await _stateService.SetPendingAdminAuthRequestAsync(null);
-                                _syncService.FullSyncAsync(true).FireAndForget();
-                                SsoAuthSuccessAction?.Invoke();
-                            }
                }
                else
                {
-                            await _stateService.SetPendingAdminAuthRequestAsync(null);
-                            StartDeviceApprovalOptionsAction?.Invoke();
-                        }
-                    }
-                    else
-                    {
-                        StartDeviceApprovalOptionsAction?.Invoke();
-                    }
-                    return;
-                }
-
-                // In the standard, non TDE case, a user must set password if they don't
-                // have one and they aren't using key connector.
-                // Note: TDE & Key connector are mutually exclusive org config options.
-                if (response.ResetMasterPassword || (decryptOptions?.RequireSetPassword == true))
-                {
-                    // TODO: We need to look into how to handle this when Org removes TDE
-                    // Will we have the User Key by now to set a new password?
-                    StartSetPasswordAction?.Invoke();
-                    return;
-                }
-
-                _syncService.FullSyncAsync(true).FireAndForget();
+                    var task = Task.Run(async () => await _syncService.FullSyncAsync(true));
                    SsoAuthSuccessAction?.Invoke();
                }
-            catch (Exception)
+            }
+            catch (Exception e)
            {
                await _deviceActionService.HideLoadingAsync();
                await _platformUtilsService.ShowDialogAsync(AppResources.LoginSsoError,
--- a/src/App/Pages/Accounts/RegisterPageViewModel.cs
+++ b/src/App/Pages/Accounts/RegisterPageViewModel.cs
@@ -177,28 +177,25 @@ namespace Bit.App.Pages
            Name = string.IsNullOrWhiteSpace(Name) ? null : Name;
            Email = Email.Trim().ToLower();
            var kdfConfig = new KdfConfig(KdfType.PBKDF2_SHA256, Constants.Pbkdf2Iterations, null, null);
-            var newMasterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, Email, kdfConfig);
-            var (newUserKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(
-                newMasterKey,
-                await _cryptoService.MakeUserKeyAsync()
-            );
-            var hashedPassword = await _cryptoService.HashMasterKeyAsync(MasterPassword, newMasterKey);
-            var (newPublicKey, newProtectedPrivateKey) = await _cryptoService.MakeKeyPairAsync(newUserKey);
+            var key = await _cryptoService.MakeKeyAsync(MasterPassword, Email, kdfConfig);
+            var encKey = await _cryptoService.MakeEncKeyAsync(key);
+            var hashedPassword = await _cryptoService.HashPasswordAsync(MasterPassword, key);
+            var keys = await _cryptoService.MakeKeyPairAsync(encKey.Item1);
            var request = new RegisterRequest
            {
                Email = Email,
                Name = Name,
                MasterPasswordHash = hashedPassword,
                MasterPasswordHint = Hint,
-                Key = newProtectedUserKey.EncryptedString,
+                Key = encKey.Item2.EncryptedString,
                Kdf = kdfConfig.Type,
                KdfIterations = kdfConfig.Iterations,
                KdfMemory = kdfConfig.Memory,
                KdfParallelism = kdfConfig.Parallelism,
                Keys = new KeysRequest
                {
-                    PublicKey = newPublicKey,
-                    EncryptedPrivateKey = newProtectedPrivateKey.EncryptedString
+                    PublicKey = keys.Item1,
+                    EncryptedPrivateKey = keys.Item2.EncryptedString
                },
                CaptchaResponse = _captchaToken,
            };
--- a/src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs
@@ -30,14 +30,14 @@ namespace Bit.App.Pages

        public async Task Init()
        {
-            Organization = await _keyConnectorService.GetManagingOrganizationAsync();
+            Organization = await _keyConnectorService.GetManagingOrganization();
        }

        public async Task MigrateAccount()
        {
            await _deviceActionService.ShowLoadingAsync(AppResources.Loading);

-            await _keyConnectorService.MigrateUserAsync();
+            await _keyConnectorService.MigrateUser();
            await _syncService.FullSyncAsync(true);

            await _deviceActionService.HideLoadingAsync();
@@ -47,7 +47,7 @@ namespace Bit.App.Pages
        {
            await _deviceActionService.ShowLoadingAsync(AppResources.Loading);

-            await _apiService.PostLeaveOrganizationAsync(Organization.Id);
+            await _apiService.PostLeaveOrganization(Organization.Id);
            await _syncService.FullSyncAsync(true);

            await _deviceActionService.HideLoadingAsync();
--- a/src/App/Pages/Accounts/SetPasswordPage.xaml
+++ b/src/App/Pages/Accounts/SetPasswordPage.xaml
@@ -28,7 +28,7 @@
        <StackLayout Spacing="20">
            <StackLayout StyleClass="box">
                <StackLayout StyleClass="box-row">
-                    <Label Text="{Binding SetMasterPasswordSummary}"
+                    <Label Text="{u:I18n SetMasterPasswordSummary}"
                       StyleClass="text-md"
                       HorizontalTextAlignment="Start"></Label>
                </StackLayout>
@@ -51,8 +51,7 @@
                        <Label
                            Text="{u:I18n ResetPasswordAutoEnrollInviteWarning}"
                            StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Start"
-                            AutomationId="ResetPasswordAutoEnrollInviteWarningLabel" />
+                            HorizontalTextAlignment="Start" />
                    </Frame>
                </Grid>
                <Grid IsVisible="{Binding IsPolicyInEffect}"
@@ -74,8 +73,7 @@
                        <Label
                            Text="{Binding PolicySummary}"
                            StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Start"
-                            AutomationId="PolicyInEffectLabel" />
+                            HorizontalTextAlignment="Start" />
                    </Frame>
                </Grid>
                <Grid StyleClass="box-row">
@@ -100,8 +98,7 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="MasterPasswordField" />
+                        Grid.Column="0" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -111,8 +108,7 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="ToggleMasterPasswordVisibilityButton" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                </Grid>
                <Label
                    Text="{u:I18n MasterPasswordDescription}"
@@ -141,8 +137,7 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="RetypePasswordField" />
+                        Grid.Column="0" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -152,8 +147,7 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="ToggleRetypePasswordVisibilityButton" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                </Grid>
                <StackLayout StyleClass="box-row">
                    <Label
@@ -164,8 +158,7 @@
                        Text="{Binding Hint}"
                        StyleClass="box-value"
                        ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="MasterPasswordHintLabel" />
+                        ReturnCommand="{Binding SubmitCommand}" />
                </StackLayout>
                <Label
                    Text="{u:I18n MasterPasswordHintDescription}"
--- a/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
@@ -5,6 +5,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
@@ -27,7 +28,6 @@ namespace Bit.App.Pages
        private readonly IPolicyService _policyService;
        private readonly IPasswordGenerationService _passwordGenerationService;
        private readonly II18nService _i18nService;
-        private readonly ISyncService _syncService;

        private bool _showPassword;
        private bool _isPolicyInEffect;
@@ -46,7 +46,6 @@ namespace Bit.App.Pages
            _passwordGenerationService =
                ServiceContainer.Resolve<IPasswordGenerationService>("passwordGenerationService");
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
-            _syncService = ServiceContainer.Resolve<ISyncService>();

            PageTitle = AppResources.SetMasterPassword;
            TogglePasswordCommand = new Command(TogglePassword);
@@ -101,17 +100,11 @@ namespace Bit.App.Pages
        public Action CloseAction { get; set; }
        public string OrgIdentifier { get; set; }
        public string OrgId { get; set; }
-        public ForcePasswordResetReason? ForceSetPasswordReason { get; private set; }
-
-        public string SetMasterPasswordSummary => ForceSetPasswordReason == ForcePasswordResetReason.TdeUserWithoutPasswordHasPasswordResetPermission
-                                                    ? AppResources.YourOrganizationPermissionsWereUpdatedRequeringYouToSetAMasterPassword
-                                                    : AppResources.YourOrganizationRequiresYouToSetAMasterPassword;

        public async Task InitAsync()
        {
            await CheckPasswordPolicy();
-            ForceSetPasswordReason = await _stateService.GetForcePasswordResetReasonAsync();
-            TriggerPropertyChanged(nameof(SetMasterPasswordSummary));
+
            try
            {
                var response = await _apiService.GetOrganizationAutoEnrollStatusAsync(OrgIdentifier);
@@ -172,52 +165,58 @@ namespace Bit.App.Pages

            var kdfConfig = new KdfConfig(KdfType.PBKDF2_SHA256, Constants.Pbkdf2Iterations, null, null);
            var email = await _stateService.GetEmailAsync();
-            var newMasterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, email, kdfConfig);
-            var masterPasswordHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, newMasterKey, HashPurpose.ServerAuthorization);
-            var localMasterPasswordHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, newMasterKey, HashPurpose.LocalAuthorization);
+            var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdfConfig);
+            var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
+            var localMasterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);

-            var (newUserKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(newMasterKey,
-                await _cryptoService.GetUserKeyAsync() ?? await _cryptoService.MakeUserKeyAsync());
-            var keysRequest = await GetKeysForSetPasswordRequestAsync(newUserKey);
+            Tuple<SymmetricCryptoKey, EncString> encKey;
+            var existingEncKey = await _cryptoService.GetEncKeyAsync();
+            if (existingEncKey == null)
+            {
+                encKey = await _cryptoService.MakeEncKeyAsync(key);
+            }
+            else
+            {
+                encKey = await _cryptoService.RemakeEncKeyAsync(key);
+            }
+
+            var keys = await _cryptoService.MakeKeyPairAsync(encKey.Item1);
            var request = new SetPasswordRequest
            {
                MasterPasswordHash = masterPasswordHash,
-                Key = newProtectedUserKey.EncryptedString,
+                Key = encKey.Item2.EncryptedString,
                MasterPasswordHint = Hint,
                Kdf = kdfConfig.Type.GetValueOrDefault(KdfType.PBKDF2_SHA256),
                KdfIterations = kdfConfig.Iterations.GetValueOrDefault(Constants.Pbkdf2Iterations),
                KdfMemory = kdfConfig.Memory,
                KdfParallelism = kdfConfig.Parallelism,
                OrgIdentifier = OrgIdentifier,
-                Keys = keysRequest
+                Keys = new KeysRequest
+                {
+                    PublicKey = keys.Item1,
+                    EncryptedPrivateKey = keys.Item2.EncryptedString
+                }
            };

            try
            {
-                await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
+                await _deviceActionService.ShowLoadingAsync(AppResources.CreatingAccount);
                // Set Password and relevant information
                await _apiService.SetPasswordAsync(request);
                await _stateService.SetKdfConfigurationAsync(kdfConfig);
-                await _cryptoService.SetUserKeyAsync(newUserKey);
-                await _cryptoService.SetMasterKeyAsync(newMasterKey);
-                await _cryptoService.SetMasterKeyHashAsync(localMasterPasswordHash);
-                await _cryptoService.SetMasterKeyEncryptedUserKeyAsync(newProtectedUserKey.EncryptedString);
-
-                // Set private key only for new JIT provisioned users in MP encryption orgs
-                // Existing TDE users will have private key set on sync or on login
-                if (keysRequest != null)
-                {
-                    await _cryptoService.SetUserPrivateKeyAsync(keysRequest.EncryptedPrivateKey);
-                }
+                await _cryptoService.SetKeyAsync(key);
+                await _cryptoService.SetKeyHashAsync(localMasterPasswordHash);
+                await _cryptoService.SetEncKeyAsync(encKey.Item2.EncryptedString);
+                await _cryptoService.SetEncPrivateKeyAsync(keys.Item2.EncryptedString);

                if (ResetPasswordAutoEnroll)
                {
                    // Grab Organization Keys
                    var response = await _apiService.GetOrganizationKeysAsync(OrgId);
                    var publicKey = CoreHelpers.Base64UrlDecode(response.PublicKey);
-                    // Grab User Key and encrypt with Org Public Key
-                    var userKey = await _cryptoService.GetUserKeyAsync();
-                    var encryptedKey = await _cryptoService.RsaEncryptAsync(userKey.Key, publicKey);
+                    // Grab user's Encryption Key and encrypt with Org Public Key
+                    var userEncKey = await _cryptoService.GetEncKeyAsync();
+                    var encryptedKey = await _cryptoService.RsaEncryptAsync(userEncKey.Key, publicKey);
                    // Request
                    var resetRequest = new OrganizationUserResetPasswordEnrollmentRequest
                    {
@@ -229,9 +228,6 @@ namespace Bit.App.Pages
                    await _apiService.PutOrganizationUserResetPasswordEnrollmentAsync(OrgId, userId, resetRequest);
                }

-                await _stateService.SetForcePasswordResetReasonAsync(null);
-                await _stateService.SetUserHasMasterPasswordAsync(true);
-                await _syncService.FullSyncAsync(true);
                await _deviceActionService.HideLoadingAsync();
                SetPasswordSuccessAction?.Invoke();
            }
@@ -246,21 +242,6 @@ namespace Bit.App.Pages
            }
        }

-        private async Task<KeysRequest> GetKeysForSetPasswordRequestAsync(UserKey newUserKey)
-        {
-            if (ForceSetPasswordReason == ForcePasswordResetReason.TdeUserWithoutPasswordHasPasswordResetPermission)
-            {
-                return null;
-            }
-
-            var (newPublicKey, newProtectedPrivateKey) = await _cryptoService.MakeKeyPairAsync(newUserKey);
-            return new KeysRequest
-            {
-                PublicKey = newPublicKey,
-                EncryptedPrivateKey = newProtectedPrivateKey.EncryptedString
-            };
-        }
-
        public void TogglePassword()
        {
            ShowPassword = !ShowPassword;
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
@@ -4,7 +4,6 @@ using Bit.App.Controls;
 using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.Forms;

@@ -18,29 +17,26 @@ namespace Bit.App.Pages

        private TwoFactorPageViewModel _vm;
        private bool _inited;
+        private bool _authingWithSso;
        private string _orgIdentifier;

        public TwoFactorPage(bool? authingWithSso = false, AppOptions appOptions = null, string orgIdentifier = null)
        {
            InitializeComponent();
            SetActivityIndicator();
+            _authingWithSso = authingWithSso ?? false;
            _appOptions = appOptions;
            _orgIdentifier = orgIdentifier;
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _vm = BindingContext as TwoFactorPageViewModel;
            _vm.Page = this;
-            _vm.AuthingWithSso = authingWithSso ?? false;
            _vm.StartSetPasswordAction = () =>
                Device.BeginInvokeOnMainThread(async () => await StartSetPasswordAsync());
            _vm.TwoFactorAuthSuccessAction = () =>
-                Device.BeginInvokeOnMainThread(async () => await TwoFactorAuthSuccessToMainAsync());
-            _vm.LockAction = () =>
-                Device.BeginInvokeOnMainThread(TwoFactorAuthSuccessWithSSOLocked);
+                Device.BeginInvokeOnMainThread(async () => await TwoFactorAuthSuccessAsync());
            _vm.UpdateTempPasswordAction =
                () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
-            _vm.StartDeviceApprovalOptionsAction =
-                () => Device.BeginInvokeOnMainThread(async () => await StartDeviceApprovalOptionsAsync());
            _vm.CloseAction = async () => await Navigation.PopModalAsync();
            DuoWebView = _duoWebView;
            if (Device.RuntimePlatform == Device.Android)
@@ -184,18 +180,13 @@ namespace Bit.App.Pages
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

-        private async Task StartDeviceApprovalOptionsAsync()
+        private async Task TwoFactorAuthSuccessAsync()
        {
-            var page = new LoginApproveDevicePage();
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
-        private void TwoFactorAuthSuccessWithSSOLocked()
+            if (_authingWithSso)
            {
                Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
            }
-
-        private async Task TwoFactorAuthSuccessToMainAsync()
+            else
            {
                if (AppHelpers.SetAlternateMainPage(_appOptions))
                {
@@ -204,6 +195,7 @@ namespace Bit.App.Pages
                var previousPage = await AppHelpers.ClearPreviousPage();
                Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
            }
+        }

        private void Token_TextChanged(object sender, TextChangedEventArgs e)
        {
--- a/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
+++ b/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
@@ -10,9 +10,7 @@ using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -34,12 +32,12 @@ namespace Bit.App.Pages
        private readonly IStateService _stateService;
        private readonly II18nService _i18nService;
        private readonly IAppIdService _appIdService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
        private readonly ILogger _logger;
-        private readonly IDeviceTrustCryptoService _deviceTrustCryptoService;
+
        private TwoFactorProviderType? _selectedProviderType;
        private string _totpInstruction;
        private string _webVaultUrl = "https://vault.bitwarden.com";
+        private bool _authingWithSso = false;
        private bool _enableContinue = false;
        private bool _showContinue = true;

@@ -56,9 +54,7 @@ namespace Bit.App.Pages
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
            _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>();
            _logger = ServiceContainer.Resolve<ILogger>();
-            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();

            PageTitle = AppResources.TwoStepLogin;
            SubmitCommand = new Command(async () => await SubmitAsync());
@@ -73,8 +69,6 @@ namespace Bit.App.Pages

        public bool Remember { get; set; }

-        public bool AuthingWithSso { get; set; }
-
        public string Token { get; set; }

        public bool DuoMethod => SelectedProviderType == TwoFactorProviderType.Duo ||
@@ -124,8 +118,6 @@ namespace Bit.App.Pages
        public Command SubmitCommand { get; }
        public ICommand MoreCommand { get; }
        public Action TwoFactorAuthSuccessAction { get; set; }
-        public Action LockAction { get; set; }
-        public Action StartDeviceApprovalOptionsAction { get; set; }
        public Action StartSetPasswordAction { get; set; }
        public Action CloseAction { get; set; }
        public Action UpdateTempPasswordAction { get; set; }
@@ -144,6 +136,8 @@ namespace Bit.App.Pages
                return;
            }

+            _authingWithSso = _authService.AuthingWithSso();
+
            if (!string.IsNullOrWhiteSpace(_environmentService.BaseUrl))
            {
                _webVaultUrl = _environmentService.BaseUrl;
@@ -321,83 +315,22 @@ namespace Bit.App.Pages

                var task = Task.Run(() => _syncService.FullSyncAsync(true));
                await _deviceActionService.HideLoadingAsync();
-                var decryptOptions = await _stateService.GetAccountDecryptionOptions();
                _messagingService.Send("listenYubiKeyOTP", false);
                _broadcasterService.Unsubscribe(nameof(TwoFactorPage));

-                if (decryptOptions?.TrustedDeviceOption != null)
+                if (_authingWithSso && result.ResetMasterPassword)
                {
-                    if (await _deviceTrustCryptoService.IsDeviceTrustedAsync())
-                    {
-                        // If we have a device key but no keys on server, we need to remove the device key
-                        if (decryptOptions.TrustedDeviceOption.EncryptedPrivateKey == null && decryptOptions.TrustedDeviceOption.EncryptedUserKey == null)
-                        {
-                            await _deviceTrustCryptoService.RemoveTrustedDeviceAsync();
-                            StartDeviceApprovalOptionsAction?.Invoke();
-                            return;
+                    StartSetPasswordAction?.Invoke();
                }
-                        // Update temp password only if the device is trusted and therefore has a decrypted User Key set
-                        if (result.ForcePasswordReset)
+                else if (result.ForcePasswordReset)
                {
                    UpdateTempPasswordAction?.Invoke();
-                            return;
-                        }
-                        // If user doesn't have a MP, but has reset password permission, they must set a MP
-                        if (!decryptOptions.HasMasterPassword &&
-                            decryptOptions.TrustedDeviceOption.HasManageResetPasswordPermission)
-                        {
-                            await _stateService.SetForcePasswordResetReasonAsync(ForcePasswordResetReason.TdeUserWithoutPasswordHasPasswordResetPermission);
-                        }
-                        // Device is trusted and has keys, so we can decrypt
-                        _syncService.FullSyncAsync(true).FireAndForget();
-                        await TwoFactorAuthSuccessAsync();
-                        return;
-                    }
-
-                    // Check for pending Admin Auth requests before navigating to device approval options
-                    var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
-                    if (pendingRequest != null)
-                    {
-                        var authRequest = await _authService.GetPasswordlessLoginRequestByIdAsync(pendingRequest.Id);
-                        if (authRequest?.RequestApproved == true)
-                        {
-                            var authResult = await _authService.LogInPasswordlessAsync(true, await _stateService.GetActiveUserEmailAsync(), authRequest.RequestAccessCode, pendingRequest.Id, pendingRequest.PrivateKey, authRequest.Key, authRequest.MasterPasswordHash);
-                            if (authResult == null && await _stateService.IsAuthenticatedAsync())
-                            {
-                                await Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(
-                                 () => _platformUtilsService.ShowToast("info", null, AppResources.LoginApproved));
-                                await _stateService.SetPendingAdminAuthRequestAsync(null);
-                                _syncService.FullSyncAsync(true).FireAndForget();
-                                await TwoFactorAuthSuccessAsync();
-                            }
                }
                else
                {
-                            await _stateService.SetPendingAdminAuthRequestAsync(null);
-                            StartDeviceApprovalOptionsAction?.Invoke();
+                    TwoFactorAuthSuccessAction?.Invoke();
                }
            }
-                    else
-                    {
-                        StartDeviceApprovalOptionsAction?.Invoke();
-                    }
-                    return;
-                }
-
-                // In the standard, non TDE case, a user must set password if they don't
-                // have one and they aren't using key connector.
-                // Note: TDE & Key connector are mutually exclusive org config options.
-                if (result.ResetMasterPassword || (decryptOptions?.RequireSetPassword ?? false))
-                {
-                    // TODO: We need to look into how to handle this when Org removes TDE
-                    // Will we have the User Key by now to set a new password?
-                    StartSetPasswordAction?.Invoke();
-                    return;
-                }
-
-                _syncService.FullSyncAsync(true).FireAndForget();
-                await TwoFactorAuthSuccessAsync();
-            }
            catch (ApiException e)
            {
                _captchaToken = null;
@@ -465,8 +398,7 @@ namespace Bit.App.Pages
                {
                    Email = _authService.Email,
                    MasterPasswordHash = _authService.MasterPasswordHash,
-                    DeviceIdentifier = await _appIdService.GetAppIdAsync(),
-                    SsoEmail2FaSessionToken = _authService.SsoEmail2FaSessionToken
+                    DeviceIdentifier = await _appIdService.GetAppIdAsync()
                };
                await _apiService.PostTwoFactorEmailAsync(request);
                if (showLoading)
@@ -490,17 +422,5 @@ namespace Bit.App.Pages
                return false;
            }
        }
-
-        public async Task TwoFactorAuthSuccessAsync()
-        {
-            if (AuthingWithSso && await _vaultTimeoutService.IsLockedAsync())
-            {
-                LockAction?.Invoke();
-            }
-            else
-            {
-                TwoFactorAuthSuccessAction?.Invoke();
-            }
-        }
    }
 }
--- a/src/App/Pages/Accounts/UpdateTempPasswordPage.xaml
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@@ -48,8 +48,7 @@
                        <Label
                            Text="{Binding UpdateMasterPasswordWarningText }"
                            StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Center"
-                            AutomationId="UpdatePasswordWarningLabel" />
+                            HorizontalTextAlignment="Center" />
                    </Frame>
                </Grid>
                <Grid IsVisible="{Binding IsPolicyInEffect}"
@@ -72,8 +71,7 @@
                        <Label
                            Text="{Binding PolicySummary}"
                            StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Start"
-                            AutomationId="PolicySummaryLabel" />
+                            HorizontalTextAlignment="Start" />
                    </Frame>
                </Grid>
                <Grid StyleClass="box-row" IsVisible="{Binding RequireCurrentPassword }">
@@ -98,8 +96,7 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="MasterPasswordField" />
+                        Grid.Column="0" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -109,8 +106,7 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="ToggleMasterPasswordVisibilityButton" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                </Grid>
                <Grid StyleClass="box-row">
                    <Grid.RowDefinitions>
@@ -134,8 +130,7 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="NewPasswordField" />
+                        Grid.Column="0" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -145,8 +140,7 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="NewPasswordVisibilityButton" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                </Grid>
            </StackLayout>
            <StackLayout StyleClass="box">
@@ -172,8 +166,7 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="RetypePasswordField" />
+                        Grid.Column="0" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -183,8 +176,7 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="ToggleRetypePasswordVisibilityButton" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                </Grid>
                <StackLayout StyleClass="box-row">
                    <Label
@@ -195,8 +187,7 @@
                        Text="{Binding Hint}"
                        StyleClass="box-value"
                        ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="MasterPasswordHintLabel" />
+                        ReturnCommand="{Binding SubmitCommand}" />
                </StackLayout>
                <Label
                    Text="{u:I18n MasterPasswordHintDescription}"
--- a/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
@@ -93,12 +93,12 @@ namespace Bit.App.Pages
            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
            var email = await _stateService.GetEmailAsync();

-            // Create new master key and hash new password
-            var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, email, kdfConfig);
-            var masterPasswordHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey);
+            // Create new key and hash new password
+            var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdfConfig);
+            var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key);

-            // Encrypt user key with new master key
-            var (userKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(masterKey);
+            // Create new encKey for the User
+            var newEncKey = await _cryptoService.RemakeEncKeyAsync(key);

            // Initiate API action
            try
@@ -108,10 +108,10 @@ namespace Bit.App.Pages
                switch (_reason)
                {
                    case ForcePasswordResetReason.AdminForcePasswordReset:
-                        await UpdateTempPasswordAsync(masterPasswordHash, newProtectedUserKey.EncryptedString);
+                        await UpdateTempPasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
                        break;
                    case ForcePasswordResetReason.WeakMasterPasswordOnLogin:
-                        await UpdatePasswordAsync(masterPasswordHash, newProtectedUserKey.EncryptedString);
+                        await UpdatePasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
                        break;
                    default:
                        throw new ArgumentOutOfRangeException();
@@ -155,7 +155,7 @@ namespace Bit.App.Pages

        private async Task UpdatePasswordAsync(string newMasterPasswordHash, string newEncKey)
        {
-            var currentPasswordHash = await _cryptoService.HashMasterKeyAsync(CurrentMasterPassword, null);
+            var currentPasswordHash = await _cryptoService.HashPasswordAsync(CurrentMasterPassword, null);

            var request = new PasswordRequest
            {
--- a/src/App/Pages/BaseContentPage.cs
+++ b/src/App/Pages/BaseContentPage.cs
@@ -150,12 +150,6 @@ namespace Bit.App.Pages
        private async Task SaveActivityAsync()
        {
            SetServices();
-            if (await _stateService.GetActiveUserIdAsync() == null)
-            {
-                // Fresh install and/or all users logged out won't have an active user, skip saving last active time
-                return;
-            }
-
            await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
        }
    }
--- a/src/App/Pages/BaseModalContentPage.cs
+++ b/src/App/Pages/BaseModalContentPage.cs
@@ -1,18 +0,0 @@
-using System;
-namespace Bit.App.Pages
-{
-    public class BaseModalContentPage : BaseContentPage
-    {
-        public BaseModalContentPage()
-        {
-        }
-
-        protected void PopModal_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                Navigation.PopModalAsync();
-            }
-        }
-    }
-}
--- a/src/App/Pages/BaseViewModel.cs
+++ b/src/App/Pages/BaseViewModel.cs
@@ -1,14 +1,11 @@
 using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -50,24 +47,5 @@ namespace Bit.App.Pages
            _logger.Value.Exception(ex);
        }

-        protected AsyncCommand CreateDefaultAsyncCommnad(Func<Task> execute, Func<object, bool> canExecute = null)
-        {
-            return new AsyncCommand(execute,
-                canExecute,
-                ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        protected async Task<bool> HasConnectivityAsync()
-        {
-            if (Connectivity.NetworkAccess == NetworkAccess.None)
-            {
-                await _platformUtilsService.Value.ShowDialogAsync(
-                    AppResources.InternetConnectionRequiredMessage,
-                    AppResources.InternetConnectionRequiredTitle);
-                return false;
-            }
-            return true;
-        }
    }
 }
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -275,18 +275,9 @@
                            Margin="0,10,0,0"/>
                        <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
                            x:Name="_anonAddyDomainNameEntry"
-                            Text="{Binding AddyIoDomainName}"
+                            Text="{Binding AnonAddyDomainName}"
                            StyleClass="box-value"
                            AutomationId="AnonAddyDomainNameEntry" />
-                        <Label IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.ForwardEmail}}"
-                            Text="{u:I18n DomainNameRequiredParenthesis}"
-                            StyleClass="box-label"
-                            Margin="0,10,0,0"/>
-                        <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.ForwardEmail}}"
-                            x:Name="_forwardEmailDomainNameEntry"
-                            Text="{Binding ForwardEmailDomainName}"
-                            StyleClass="box-value"
-                            AutomationId="ForwardEmailDomainNameEntry" />
                    </StackLayout>                    
                    <!--RANDOM WORD OPTIONS-->
                    <Grid IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}">
--- a/src/App/Pages/Generator/GeneratorPage.xaml.cs
+++ b/src/App/Pages/Generator/GeneratorPage.xaml.cs
@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Styles;
-using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
@@ -80,7 +79,7 @@ namespace Bit.App.Pages

            _broadcasterService.Subscribe(nameof(GeneratorPage), (message) =>
            {
-                if (message.Command is ThemeManager.UPDATED_THEME_MESSAGE_KEY)
+                if (message.Command == "updatedTheme")
                {
                    Device.BeginInvokeOnMainThread(() => _vm.RedrawPassword());
                }
--- a/src/App/Pages/Generator/GeneratorPageViewModel.cs
+++ b/src/App/Pages/Generator/GeneratorPageViewModel.cs
@@ -81,7 +81,6 @@ namespace Bit.App.Pages
                ForwardedEmailServiceType.DuckDuckGo,
                ForwardedEmailServiceType.Fastmail,
                ForwardedEmailServiceType.FirefoxRelay,
-                ForwardedEmailServiceType.ForwardEmail,
                ForwardedEmailServiceType.SimpleLogin
            };

@@ -462,8 +461,6 @@ namespace Bit.App.Pages
                        return _usernameOptions.FirefoxRelayApiAccessToken;
                    case ForwardedEmailServiceType.SimpleLogin:
                        return _usernameOptions.SimpleLoginApiKey;
-                    case ForwardedEmailServiceType.ForwardEmail:
-                        return _usernameOptions.ForwardEmailApiAccessToken;
                    default:
                        return null;
                }
@@ -508,14 +505,6 @@ namespace Bit.App.Pages
                            changed = true;
                        }
                        break;
-
-                    case ForwardedEmailServiceType.ForwardEmail:
-                        if (_usernameOptions.ForwardEmailApiAccessToken != value)
-                        {
-                            _usernameOptions.ForwardEmailApiAccessToken = value;
-                            changed = true;
-                        }
-                        break;
                    default:
                        break;
                }
@@ -540,7 +529,6 @@ namespace Bit.App.Pages
                    case ForwardedEmailServiceType.DuckDuckGo:
                    case ForwardedEmailServiceType.Fastmail:
                    case ForwardedEmailServiceType.SimpleLogin:
-                    case ForwardedEmailServiceType.ForwardEmail:
                        return AppResources.APIKeyRequiredParenthesis;
                    default:
                        return null;
@@ -557,7 +545,7 @@ namespace Bit.App.Pages
            set => SetProperty(ref _showForwardedEmailApiSecret, value);
        }

-        public string AddyIoDomainName
+        public string AnonAddyDomainName
        {
            get => _usernameOptions.AnonAddyDomainName;
            set
@@ -565,21 +553,7 @@ namespace Bit.App.Pages
                if (_usernameOptions.AnonAddyDomainName != value)
                {
                    _usernameOptions.AnonAddyDomainName = value;
-                    TriggerPropertyChanged(nameof(AddyIoDomainName));
-                    SaveUsernameOptionsAsync(false).FireAndForget();
-                }
-            }
-        }
-
-        public string ForwardEmailDomainName
-        {
-            get => _usernameOptions.ForwardEmailDomainName;
-            set
-            {
-                if (_usernameOptions.ForwardEmailDomainName != value)
-                {
-                    _usernameOptions.ForwardEmailDomainName = value;
-                    TriggerPropertyChanged(nameof(ForwardEmailDomainName));
+                    TriggerPropertyChanged(nameof(AnonAddyDomainName));
                    SaveUsernameOptionsAsync(false).FireAndForget();
                }
            }
@@ -819,7 +793,7 @@ namespace Bit.App.Pages
            TriggerPropertyChanged(nameof(CapitalizeRandomWordUsername));
            TriggerPropertyChanged(nameof(ForwardedEmailApiSecret));
            TriggerPropertyChanged(nameof(ForwardedEmailApiSecretLabel));
-            TriggerPropertyChanged(nameof(AddyIoDomainName));
+            TriggerPropertyChanged(nameof(AnonAddyDomainName));
            TriggerPropertyChanged(nameof(CatchAllEmailDomain));
            TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected));
            TriggerPropertyChanged(nameof(UsernameTypeSelected));
@@ -829,7 +803,6 @@ namespace Bit.App.Pages
            TriggerPropertyChanged(nameof(GeneratorTypeSelected));
            TriggerPropertyChanged(nameof(UsernameTypeDescriptionLabel));
            TriggerPropertyChanged(nameof(EmailWebsite));
-            TriggerPropertyChanged(nameof(ForwardEmailDomainName));
        }

        private void SetOptions()
--- a/src/App/Pages/PickerViewModel.cs
+++ b/src/App/Pages/PickerViewModel.cs
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-
-namespace Bit.App.Pages
-{
-    public class PickerViewModel<TKey> : ExtendedViewModel
-    {
-        const string SELECTED_CHARACTER = "✓";
-
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly ILogger _logger;
-        private readonly Func<TKey, Task<bool>> _onSelectionChangingAsync;
-        private readonly string _title;
-
-        public Dictionary<TKey, string> _items;
-        private TKey _selectedKey;
-        private TKey _defaultSelectedKeyIfFailsToFind;
-        private Func<TKey, Task> _afterSelectionChangedAsync;
-
-        public PickerViewModel(IDeviceActionService deviceActionService,
-            ILogger logger,
-            Func<TKey, Task<bool>> onSelectionChangingAsync,
-            string title,
-            Func<object, bool> canExecuteSelectOptionCommand = null,
-            Action<Exception> onSelectOptionCommandException = null)
-        {
-            _deviceActionService = deviceActionService;
-            _logger = logger;
-            _onSelectionChangingAsync = onSelectionChangingAsync;
-            _title = title;
-
-            SelectOptionCommand = new AsyncCommand(SelectOptionAsync, canExecuteSelectOptionCommand, onSelectOptionCommandException, allowsMultipleExecutions: false);
-        }
-
-        public AsyncCommand SelectOptionCommand { get; }
-
-        public TKey SelectedKey => _selectedKey;
-
-        public string SelectedValue
-        {
-            get
-            {
-                if (_items.TryGetValue(_selectedKey, out var option))
-                {
-                    return option;
-                }
-
-                _selectedKey = _defaultSelectedKeyIfFailsToFind;
-                return _items[_selectedKey];
-            }
-        }
-
-        public void Init(Dictionary<TKey, string> items, TKey currentSelectedKey, TKey defaultSelectedKeyIfFailsToFind, bool logIfKeyNotFound = true)
-        {
-            _items = items;
-            _defaultSelectedKeyIfFailsToFind = defaultSelectedKeyIfFailsToFind;
-
-            Select(currentSelectedKey, logIfKeyNotFound);
-        }
-
-        public void Select(TKey key, bool logIfKeyNotFound = true)
-        {
-            if (!_items.ContainsKey(key))
-            {
-                if (logIfKeyNotFound)
-                {
-                    _logger.Error($"There is no {_title} options for key: {key}");
-                }
-                key = _defaultSelectedKeyIfFailsToFind;
-            }
-
-            _selectedKey = key;
-
-            MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(SelectedValue)));
-        }
-
-        private async Task SelectOptionAsync()
-        {
-            var selection = await _deviceActionService.DisplayActionSheetAsync(_title,
-                AppResources.Cancel,
-                null,
-                _items.Select(o => CreateSelectableOption(o.Value, EqualityComparer<TKey>.Default.Equals(o.Key, _selectedKey)))
-                      .ToArray()
-            );
-
-            if (selection == null || selection == AppResources.Cancel)
-            {
-                return;
-            }
-
-            var sanitizedSelection = selection.Replace($"{SELECTED_CHARACTER} ", string.Empty);
-            var optionKey = _items.First(o => o.Value == sanitizedSelection).Key;
-
-            if (EqualityComparer<TKey>.Default.Equals(optionKey, _selectedKey)
-                ||
-                !await _onSelectionChangingAsync(optionKey))
-            {
-                return;
-            }
-
-            _selectedKey = optionKey;
-            TriggerPropertyChanged(nameof(SelectedValue));
-
-            if (_afterSelectionChangedAsync != null)
-            {
-                await _afterSelectionChangedAsync(_selectedKey);
-            }
-        }
-
-        public void SetAfterSelectionChanged(Func<TKey, Task> afterSelectionChangedAsync) => _afterSelectionChangedAsync = afterSelectionChangedAsync;
-
-        private string CreateSelectableOption(string option, bool selected) => selected ? ToSelectedOption(option) : option;
-
-        private string ToSelectedOption(string option) => $"{SELECTED_CHARACTER} {option}";
-    }
-}
--- a/src/App/Pages/Send/SendAddEditPage.xaml
+++ b/src/App/Pages/Send/SendAddEditPage.xaml
@@ -175,7 +175,7 @@
                                    LineBreakMode="CharacterWrap"
                                    StyleClass="text-sm, text-muted"
                                    HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Start"
+                                    HorizontalTextAlignment="Center"
                                    AutomationId="SendNoFileChosenLabel" />
                                <Label
                                    IsVisible="{Binding FileName, Converter={StaticResource notNull}}"
@@ -183,7 +183,7 @@
                                    LineBreakMode="CharacterWrap"
                                    StyleClass="text-sm, text-muted"
                                    HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Start"
+                                    HorizontalTextAlignment="Center"
                                    AutomationId="SendCurrentFileNameLabel" />
                                <Button
                                    Text="{u:I18n ChooseFile}"
@@ -197,7 +197,7 @@
                                    Text="{u:I18n MaxFileSize}"
                                    StyleClass="text-sm, text-muted"
                                    HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Start" />
+                                    HorizontalTextAlignment="Center" />
                            </StackLayout>
                            <Label
                                Text="{u:I18n TypeFileInfo}"
@@ -250,6 +250,20 @@
                                    AutomationId="SendHideTextByDefaultToggle" />
                            </StackLayout>
                        </StackLayout>
+                        <StackLayout
+                            StyleClass="box-row, box-row-switch">
+                            <Label
+                                Text="{Binding ShareOnSaveText}"
+                                StyleClass="box-label-regular"
+                                VerticalOptions="Center"
+                                HorizontalOptions="StartAndExpand" />
+                            <Switch
+                                IsToggled="{Binding ShareOnSave}"
+                                IsEnabled="{Binding SendEnabled}"
+                                HorizontalOptions="End"
+                                Margin="10,0,0,0"
+                                AutomationId="SendShareSendAfterSaveToggle" />
+                        </StackLayout>
                        <StackLayout
                            Orientation="Horizontal"
                            Spacing="0"
--- a/src/App/Pages/Send/SendAddEditPageViewModel.cs
+++ b/src/App/Pages/Send/SendAddEditPageViewModel.cs
@@ -127,9 +127,10 @@ namespace Bit.App.Pages
        public SendType? Type { get; set; }
        public byte[] FileData { get; set; }
        public string NewPassword { get; set; }
+        public bool ShareOnSave { get; set; }
        public bool DisableHideEmailControl { get; set; }
        public bool IsAddFromShare { get; set; }
-        public bool CopyInsteadOfShareAfterSaving { get; set; }
+        public string ShareOnSaveText => CopyInsteadOfShareAfterSaving ? AppResources.CopySendLinkOnSave : AppResources.ShareOnSave;
        public string OptionsAccessilibityText => ShowOptions ? AppResources.OptionsExpanded : AppResources.OptionsCollapsed;
        public List<KeyValuePair<string, SendType>> TypeOptions { get; }
        public List<KeyValuePair<string, string>> DeletionTypeOptions { get; }
@@ -183,6 +184,15 @@ namespace Bit.App.Pages
                }
            }
        }
+        public bool CopyInsteadOfShareAfterSaving
+        {
+            get => _copyInsteadOfShareAfterSaving;
+            set
+            {
+                SetProperty(ref _copyInsteadOfShareAfterSaving, value);
+                TriggerPropertyChanged(nameof(ShareOnSaveText));
+            }
+        }
        public SendView Send
        {
            get => _send;
@@ -402,11 +412,19 @@ namespace Bit.App.Pages
                    _messagingService.Send("sendUpdated");
                }

+                if (!ShareOnSave)
+                {
+                    _platformUtilsService.ShowToast("success", null,
+                    EditMode ? AppResources.SendUpdated : AppResources.NewSendCreated);
+                }
+
                if (!CopyInsteadOfShareAfterSaving)
                {
                    await CloseAsync();
                }

+                if (ShareOnSave)
+                {
                    var savedSend = await _sendService.GetAsync(sendId);
                    if (savedSend != null)
                    {
@@ -423,6 +441,7 @@ namespace Bit.App.Pages
                            await AppHelpers.ShareSendUrlAsync(savedSendView);
                        }
                    }
+                }

                if (CopyInsteadOfShareAfterSaving)
                {
--- a/src/App/Pages/Send/SendAddOnlyPage.xaml
+++ b/src/App/Pages/Send/SendAddOnlyPage.xaml
@@ -94,13 +94,13 @@
                            LineBreakMode="CharacterWrap"
                            StyleClass="text-sm, text-muted"
                            HorizontalOptions="FillAndExpand"
-                            HorizontalTextAlignment="Start" />
+                            HorizontalTextAlignment="Center" />
                        <Label
                            Margin="0, 5, 0, 0"
                            Text="{u:I18n MaxFileSize}"
                            StyleClass="text-sm, text-muted"
                            HorizontalOptions="FillAndExpand"
-                            HorizontalTextAlignment="Start" />
+                            HorizontalTextAlignment="Center" />
                    </StackLayout>
                </StackLayout>
                <StackLayout
@@ -145,6 +145,19 @@
                            Margin="10,0,0,0" />
                    </StackLayout>
                </StackLayout>
+                <StackLayout
+                    StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{Binding ShareOnSaveText}"
+                        StyleClass="box-label-regular"
+                        VerticalOptions="Center"
+                        HorizontalOptions="StartAndExpand" />
+                    <Switch
+                        IsToggled="{Binding ShareOnSave}"
+                        IsEnabled="{Binding SendEnabled}"
+                        HorizontalOptions="End"
+                        Margin="10,0,0,0" />
+                </StackLayout>
                <StackLayout
                    Orientation="Horizontal"
                    Spacing="0"
--- a/src/App/Pages/Settings/AboutSettingsPage.xaml
+++ b/src/App/Pages/Settings/AboutSettingsPage.xaml
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:AboutSettingsPageViewModel"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:Class="Bit.App.Pages.AboutSettingsPage"
-    Title="{u:I18n About}">
-    
-    <ContentPage.BindingContext>
-        <pages:AboutSettingsPageViewModel />
-    </ContentPage.BindingContext>
-
-    <StackLayout>
-        <controls:SwitchItemView
-            Title="{u:I18n SubmitCrashLogs}"
-            IsToggled="{Binding ShouldSubmitCrashLogs, Mode=TwoWay}"
-            AutomationId="SubmitCrashLogsSwitch"
-            StyleClass="settings-item-view"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n BitwardenHelpCenter}"
-            GoToLinkCommand="{Binding GoToHelpCenterCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n ContactBitwardenSupport}"
-            GoToLinkCommand="{Binding ContactBitwardenSupportCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n WebVault}"
-            GoToLinkCommand="{Binding GoToWebVaultCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n LearnOrg}"
-            GoToLinkCommand="{Binding GoToLearnAboutOrgsCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n RateTheApp}"
-            GoToLinkCommand="{Binding RateTheAppCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <StackLayout
-            Padding="16,12"
-            Orientation="Horizontal">
-            <controls:CustomLabel
-                Text="{Binding AppInfo}"
-                MaxLines="10"
-                StyleClass="box-footer-label"
-                HorizontalOptions="StartAndExpand"
-                LineBreakMode="TailTruncation" />
-
-            <controls:IconLabel
-                Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-                TextColor="Black"
-                HorizontalOptions="End"
-                VerticalOptions="Center"
-                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n CopyAppInformation}">
-                <controls:IconLabel.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding CopyAppInfoCommand}" />
-                </controls:IconLabel.GestureRecognizers>
-            </controls:IconLabel>
-
-        </StackLayout>
-    </StackLayout>
-</pages:BaseContentPage>
--- a/src/App/Pages/Settings/AboutSettingsPage.xaml.cs
+++ b/src/App/Pages/Settings/AboutSettingsPage.xaml.cs
@@ -1,37 +0,0 @@
-using System;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public partial class AboutSettingsPage : BaseContentPage
-    {
-        private readonly AboutSettingsPageViewModel _vm;
-
-        public AboutSettingsPage()
-        {
-            InitializeComponent();
-            _vm = BindingContext as AboutSettingsPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            try
-            {
-                await _vm.InitAsync();
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                ServiceContainer.Resolve<IPlatformUtilsService>().ShowToast(null, null, AppResources.AnErrorHasOccurred);
-
-                Navigation.PopAsync().FireAndForget();
-            }
-        }
-    }
-}
--- a/src/App/Pages/Settings/AboutSettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/AboutSettingsPageViewModel.cs
@@ -1,159 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-
-namespace Bit.App.Pages
-{
-    public class AboutSettingsPageViewModel : BaseViewModel
-    {
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly ILogger _logger;
-
-        private bool _inited;
-        private bool _shouldSubmitCrashLogs;
-
-        public AboutSettingsPageViewModel()
-        {
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-
-            var environmentService = ServiceContainer.Resolve<IEnvironmentService>();
-            var clipboardService = ServiceContainer.Resolve<IClipboardService>();
-
-            ToggleSubmitCrashLogsCommand = CreateDefaultAsyncCommnad(ToggleSubmitCrashLogsAsync);
-
-            GoToHelpCenterCommand = CreateDefaultAsyncCommnad(
-                () => LaunchUriAsync(AppResources.LearnMoreAboutHowToUseBitwardenOnTheHelpCenter,
-                                     AppResources.ContinueToHelpCenter,
-                                     ExternalLinksConstants.HELP_CENTER));
-
-            ContactBitwardenSupportCommand = CreateDefaultAsyncCommnad(
-                () => LaunchUriAsync(AppResources.ContactSupportDescriptionLong,
-                                     AppResources.ContinueToContactSupport,
-                                     ExternalLinksConstants.CONTACT_SUPPORT));
-
-            GoToWebVaultCommand = CreateDefaultAsyncCommnad(
-                () => LaunchUriAsync(AppResources.ExploreMoreFeaturesOfYourBitwardenAccountOnTheWebApp,
-                                     AppResources.ContinueToWebApp,
-                                     environmentService.GetWebVaultUrl()));
-
-            GoToLearnAboutOrgsCommand = CreateDefaultAsyncCommnad(
-                () => LaunchUriAsync(AppResources.LearnAboutOrganizationsDescriptionLong,
-                                     string.Format(AppResources.ContinueToX, ExternalLinksConstants.BITWARDEN_WEBSITE),
-                                     ExternalLinksConstants.HELP_ABOUT_ORGANIZATIONS));
-
-            RateTheAppCommand = CreateDefaultAsyncCommnad(RateAppAsync);
-
-            CopyAppInfoCommand = CreateDefaultAsyncCommnad(
-                () => clipboardService.CopyTextAsync(AppInfo));
-        }
-
-        public bool ShouldSubmitCrashLogs
-        {
-            get => _shouldSubmitCrashLogs;
-            set
-            {
-                SetProperty(ref _shouldSubmitCrashLogs, value);
-                ((ICommand)ToggleSubmitCrashLogsCommand).Execute(null);
-            }
-        }
-
-        public string AppInfo
-        {
-            get
-            {
-                var appInfo = string.Format("{0}: {1} ({2})",
-                    AppResources.Version,
-                    _platformUtilsService.GetApplicationVersion(),
-                    _deviceActionService.GetBuildNumber());
-
-                return $"© Bitwarden Inc. 2015-{DateTime.Now.Year}\n\n{appInfo}";
-            }
-        }
-
-        public AsyncCommand ToggleSubmitCrashLogsCommand { get; }
-        public ICommand GoToHelpCenterCommand { get; }
-        public ICommand ContactBitwardenSupportCommand { get; }
-        public ICommand GoToWebVaultCommand { get; }
-        public ICommand GoToLearnAboutOrgsCommand { get; }
-        public ICommand RateTheAppCommand { get; }
-        public ICommand CopyAppInfoCommand { get; }
-
-        public async Task InitAsync()
-        {
-            _shouldSubmitCrashLogs = await _logger.IsEnabled();
-
-            _inited = true;
-
-            MainThread.BeginInvokeOnMainThread(() =>
-            {
-                TriggerPropertyChanged(nameof(ShouldSubmitCrashLogs));
-                ToggleSubmitCrashLogsCommand.RaiseCanExecuteChanged();
-            });
-        }
-
-        private async Task ToggleSubmitCrashLogsAsync()
-        {
-            await _logger.SetEnabled(ShouldSubmitCrashLogs);
-            _shouldSubmitCrashLogs = await _logger.IsEnabled();
-
-            MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(ShouldSubmitCrashLogs)));
-        }
-
-        private async Task LaunchUriAsync(string dialogText, string dialogTitle, string uri)
-        {
-            if (await _platformUtilsService.ShowDialogAsync(dialogText, dialogTitle, AppResources.Continue, AppResources.Cancel))
-            {
-                _platformUtilsService.LaunchUri(uri);
-            }
-        }
-
-        private async Task RateAppAsync()
-        {
-            if (await _platformUtilsService.ShowDialogAsync(AppResources.RateAppDescriptionLong, AppResources.ContinueToAppStore, AppResources.Continue, AppResources.Cancel))
-            {
-                await MainThread.InvokeOnMainThreadAsync(_deviceActionService.RateApp);
-            }
-        }
-
-        /// INFO: Left here in case we need to debug push notifications
-        /// <summary>
-        /// Sets up app info plus debugging information for push notifications.
-        /// Useful when trying to solve problems regarding push notifications.
-        /// </summary>
-        /// <example>
-        /// Add an IniAsync() method to be called on view appearing, change the AppInfo to be a normal property with setter
-        /// and set the result of this method in the main thread to that property to show that in the UI.
-        /// </example>
-        //        public async Task<string> GetAppInfoForPushNotificationsDebugAsync()
-        //        {
-        //            var stateService = ServiceContainer.Resolve<IStateService>();
-
-        //            var appInfo = string.Format("{0}: {1} ({2})", AppResources.Version,
-        //                _platformUtilsService.GetApplicationVersion(), _deviceActionService.GetBuildNumber());
-
-        //#if DEBUG
-        //            var pushNotificationsRegistered = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService").IsRegisteredForPush;
-        //            var pnServerRegDate = await stateService.GetPushLastRegistrationDateAsync();
-        //            var pnServerError = await stateService.GetPushInstallationRegistrationErrorAsync();
-
-        //            var pnServerRegDateMessage = default(DateTime) == pnServerRegDate ? "-" : $"{pnServerRegDate.GetValueOrDefault().ToShortDateString()}-{pnServerRegDate.GetValueOrDefault().ToShortTimeString()} UTC";
-        //            var errorMessage = string.IsNullOrEmpty(pnServerError) ? string.Empty : $"Push Notifications Server Registration error: {pnServerError}";
-
-        //            var text = string.Format("© Bitwarden Inc. 2015-{0}\n\n{1}\nPush Notifications registered:{2}\nPush Notifications Server Last Date :{3}\n{4}", DateTime.Now.Year, appInfo, pushNotificationsRegistered, pnServerRegDateMessage, errorMessage);
-        //#else
-        //            var text = string.Format("© Bitwarden Inc. 2015-{0}\n\n{1}", DateTime.Now.Year, appInfo);
-        //#endif
-        //            return text;
-        //        }
-    }
-}
--- a/src/App/Pages/Settings/AppearanceSettingsPage.xaml
+++ b/src/App/Pages/Settings/AppearanceSettingsPage.xaml
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:AppearanceSettingsPageViewModel"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:Class="Bit.App.Pages.AppearanceSettingsPage"
-    Title="{u:I18n Appearance}">
-    
-    <ContentPage.BindingContext>
-        <pages:AppearanceSettingsPageViewModel />
-    </ContentPage.BindingContext>
-
-    <ScrollView Padding="0, 0, 0, 20">
-        <StackLayout Padding="0" Spacing="5">
-            
-            <controls:SettingChooserItemView
-                Title="{u:I18n Language}"
-                Subtitle="{u:I18n LanguageChangeRequiresAppRestart}"
-                DisplayValue="{Binding LanguagePickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding LanguagePickerViewModel.SelectOptionCommand}"
-                AutomationId="LanguageChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-            
-            <controls:SettingChooserItemView
-                Title="{u:I18n Theme}"
-                Subtitle="{u:I18n ThemeDescription}"
-                DisplayValue="{Binding ThemePickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding ThemePickerViewModel.SelectOptionCommand}"
-                AutomationId="ThemeChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-
-            <controls:SettingChooserItemView
-                Title="{u:I18n DefaultDarkTheme}"
-                Subtitle="{u:I18n DefaultDarkThemeDescriptionLong}"
-                DisplayValue="{Binding DefaultDarkThemePickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding DefaultDarkThemePickerViewModel.SelectOptionCommand}"
-                IsVisible="{Binding ShowDefaultDarkThemePicker}"
-                AutomationId="DefaultDarkThemeChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-            
-            <controls:SwitchItemView
-                Title="{u:I18n ShowWebsiteIcons}"
-                Subtitle="{u:I18n ShowWebsiteIconsDescription}"
-                IsToggled="{Binding ShowWebsiteIcons}"
-                IsEnabled="{Binding IsShowWebsiteIconsEnabled}"
-                AutomationId="ShowWebsiteIconsSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-        </StackLayout>
-    </ScrollView>
-</pages:BaseContentPage>
--- a/src/App/Pages/Settings/AppearanceSettingsPage.xaml.cs
+++ b/src/App/Pages/Settings/AppearanceSettingsPage.xaml.cs
@@ -1,44 +0,0 @@
-using System;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public partial class AppearanceSettingsPage : BaseContentPage
-    {
-        private readonly AppearanceSettingsPageViewModel _vm;
-
-        public AppearanceSettingsPage()
-        {
-            InitializeComponent();
-            _vm = BindingContext as AppearanceSettingsPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            try
-            {
-                _vm.SubscribeEvents();
-                await _vm.InitAsync();
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                ServiceContainer.Resolve<IPlatformUtilsService>().ShowToast(null, null, AppResources.AnErrorHasOccurred);
-
-                Navigation.PopModalAsync().FireAndForget();
-            }
-        }
-
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-            _vm.UnsubscribeEvents();
-        }
-    }
-}
--- a/src/App/Pages/Settings/AppearanceSettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/AppearanceSettingsPageViewModel.cs
@@ -1,203 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class AppearanceSettingsPageViewModel : BaseViewModel
-    {
-        private readonly IStateService _stateService;
-        private readonly ILogger _logger;
-        private readonly II18nService _i18nService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IMessagingService _messagingService;
-
-        private bool _inited;
-        private bool _showWebsiteIcons;
-
-        public AppearanceSettingsPageViewModel()
-        {
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-            _i18nService = ServiceContainer.Resolve<II18nService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _messagingService = ServiceContainer.Resolve<IMessagingService>();
-
-            var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-
-            LanguagePickerViewModel = new PickerViewModel<string>(
-                deviceActionService,
-                _logger,
-                OnLanguageChangingAsync,
-                AppResources.Language,
-                _ => _inited,
-                ex => HandleException(ex));
-
-            ThemePickerViewModel = new PickerViewModel<string>(
-                deviceActionService,
-                _logger,
-                key => OnThemeChangingAsync(key, DefaultDarkThemePickerViewModel.SelectedKey),
-                AppResources.Theme,
-                _ => _inited,
-                ex => HandleException(ex));
-            ThemePickerViewModel.SetAfterSelectionChanged(_ =>
-                MainThread.InvokeOnMainThreadAsync(() =>
-                {
-                    TriggerPropertyChanged(nameof(ShowDefaultDarkThemePicker));
-                }));
-
-            DefaultDarkThemePickerViewModel = new PickerViewModel<string>(
-                deviceActionService,
-                _logger,
-                key => OnThemeChangingAsync(ThemePickerViewModel.SelectedKey, key),
-                AppResources.DefaultDarkTheme,
-                _ => _inited,
-                ex => HandleException(ex));
-
-            ToggleShowWebsiteIconsCommand = CreateDefaultAsyncCommnad(ToggleShowWebsiteIconsAsync, _ => _inited);
-        }
-
-        public PickerViewModel<string> LanguagePickerViewModel { get; }
-        public PickerViewModel<string> ThemePickerViewModel { get; }
-        public PickerViewModel<string> DefaultDarkThemePickerViewModel { get; }
-
-        public bool ShowDefaultDarkThemePicker => ThemePickerViewModel.SelectedKey == string.Empty;
-
-        public bool ShowWebsiteIcons
-        {
-            get => _showWebsiteIcons;
-            set
-            {
-                if (SetProperty(ref _showWebsiteIcons, value))
-                {
-                    ((ICommand)ToggleShowWebsiteIconsCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool IsShowWebsiteIconsEnabled => ToggleShowWebsiteIconsCommand.CanExecute(null);
-
-        public AsyncCommand ToggleShowWebsiteIconsCommand { get; }
-
-        public async Task InitAsync()
-        {
-            _showWebsiteIcons = !(await _stateService.GetDisableFaviconAsync() ?? false);
-            MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(ShowWebsiteIcons)));
-
-            InitLanguagePicker();
-            await InitThemePickerAsync();
-            await InitDefaultDarkThemePickerAsync();
-
-            _inited = true;
-
-            MainThread.BeginInvokeOnMainThread(() =>
-            {
-                ToggleShowWebsiteIconsCommand.RaiseCanExecuteChanged();
-                LanguagePickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-                ThemePickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-                DefaultDarkThemePickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-            });
-        }
-
-        private void InitLanguagePicker()
-        {
-            var options = new Dictionary<string, string>
-            {
-                [string.Empty] = AppResources.DefaultSystem
-            };
-            _i18nService.LocaleNames
-                .ToList()
-                .ForEach(pair => options[pair.Key] = pair.Value);
-
-            var selectedKey = _stateService.GetLocale() ?? string.Empty;
-
-            LanguagePickerViewModel.Init(options, selectedKey, string.Empty);
-        }
-
-        private async Task InitThemePickerAsync()
-        {
-            var options = new Dictionary<string, string>
-            {
-                [string.Empty] = AppResources.ThemeDefault,
-                [ThemeManager.Light] = AppResources.Light,
-                [ThemeManager.Dark] = AppResources.Dark,
-                [ThemeManager.Black] = AppResources.Black,
-                [ThemeManager.Nord] = AppResources.Nord,
-                [ThemeManager.SolarizedDark] = AppResources.SolarizedDark
-            };
-
-            var selectedKey = await _stateService.GetThemeAsync() ?? string.Empty;
-
-            ThemePickerViewModel.Init(options, selectedKey, string.Empty);
-
-            TriggerPropertyChanged(nameof(ShowDefaultDarkThemePicker));
-        }
-
-        private async Task InitDefaultDarkThemePickerAsync()
-        {
-            var options = new Dictionary<string, string>
-            {
-                [ThemeManager.Dark] = AppResources.Dark,
-                [ThemeManager.Black] = AppResources.Black,
-                [ThemeManager.Nord] = AppResources.Nord,
-                [ThemeManager.SolarizedDark] = AppResources.SolarizedDark
-            };
-
-            var selectedKey = await _stateService.GetAutoDarkThemeAsync() ?? ThemeManager.Dark;
-
-            DefaultDarkThemePickerViewModel.Init(options, selectedKey, ThemeManager.Dark);
-        }
-
-        private async Task<bool> OnLanguageChangingAsync(string selectedLanguage)
-        {
-            _stateService.SetLocale(selectedLanguage == string.Empty ? (string)null : selectedLanguage);
-
-            await _platformUtilsService.ShowDialogAsync(string.Format(AppResources.LanguageChangeXDescription, LanguagePickerViewModel.SelectedValue), AppResources.Language, AppResources.Ok);
-            return true;
-        }
-
-        private async Task<bool> OnThemeChangingAsync(string selectedTheme, string selectedDefaultDarkTheme)
-        {
-            await _stateService.SetThemeAsync(selectedTheme == string.Empty ? (string)null : selectedTheme);
-            await _stateService.SetAutoDarkThemeAsync(selectedDefaultDarkTheme == string.Empty ? (string)null : selectedDefaultDarkTheme);
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                ThemeManager.SetTheme(Application.Current.Resources);
-                _messagingService.Send(ThemeManager.UPDATED_THEME_MESSAGE_KEY);
-            });
-            return true;
-        }
-
-        private async Task ToggleShowWebsiteIconsAsync()
-        {
-            // TODO: [PS-961] Fix negative function names
-            await _stateService.SetDisableFaviconAsync(!ShowWebsiteIcons);
-        }
-
-        private void ToggleShowWebsiteIconsCommand_CanExecuteChanged(object sender, EventArgs e)
-        {
-            TriggerPropertyChanged(nameof(IsShowWebsiteIconsEnabled));
-        }
-
-        internal void SubscribeEvents()
-        {
-            ToggleShowWebsiteIconsCommand.CanExecuteChanged += ToggleShowWebsiteIconsCommand_CanExecuteChanged;
-        }
-
-        internal void UnsubscribeEvents()
-        {
-            ToggleShowWebsiteIconsCommand.CanExecuteChanged -= ToggleShowWebsiteIconsCommand_CanExecuteChanged;
-        }
-    }
-}
--- a/src/App/Pages/Settings/AutofillServicesPage.xaml
+++ b/src/App/Pages/Settings/AutofillServicesPage.xaml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BaseContentPage 
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Bit.App.Pages.AutofillServicesPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    x:DataType="pages:AutofillServicesPageViewModel"
+    Title="{Binding PageTitle}">
+    <ContentPage.BindingContext>
+        <pages:AutofillServicesPageViewModel />
+    </ContentPage.BindingContext>
+
+    <ScrollView>
+        <StackLayout Padding="0" Spacing="20">
+            <StackLayout 
+                StyleClass="box"
+                IsVisible="{Binding AutofillServiceVisible}">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n AutofillService}"
+                        StyleClass="box-label-regular"
+                        HorizontalOptions="StartAndExpand" />
+                    <RelativeLayout HorizontalOptions="End">
+                        <Switch
+                            x:Name="AutofillServiceSwitch"
+                            IsToggled="{Binding AutofillServiceToggled}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                        <Button
+                            Clicked="ToggleAutofillService"
+                            StyleClass="box-overlay"
+                            RelativeLayout.XConstraint="0"
+                            RelativeLayout.YConstraint="0"
+                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AutofillServiceSwitch, Property=Width}"
+                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AutofillServiceSwitch, Property=Height}" />
+                    </RelativeLayout>
+                </StackLayout>
+                <Label
+                    Text="{u:I18n AutofillServiceDescription}"
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+            </StackLayout>
+            <StackLayout 
+                StyleClass="box"
+                IsVisible="{Binding InlineAutofillVisible}">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n InlineAutofill}"
+                        StyleClass="box-label-regular"
+                        IsEnabled="{Binding InlineAutofillEnabled}"
+                        HorizontalOptions="StartAndExpand" />
+                    <RelativeLayout HorizontalOptions="End">
+                        <Switch
+                            x:Name="InlineAutofillSwitch"
+                            IsEnabled="{Binding InlineAutofillEnabled}"
+                            IsToggled="{Binding InlineAutofillToggled}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                        <Button
+                            Clicked="ToggleInlineAutofill"
+                            StyleClass="box-overlay"
+                            RelativeLayout.XConstraint="0"
+                            RelativeLayout.YConstraint="0"
+                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=InlineAutofillSwitch, Property=Width}"
+                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=InlineAutofillSwitch, Property=Height}" />
+                    </RelativeLayout>
+                </StackLayout>
+                <Label
+                    Text="{u:I18n InlineAutofillDescription}"
+                    StyleClass="box-footer-label, box-footer-label-switch"
+                    IsEnabled="{Binding InlineAutofillEnabled}"/>
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n Accessibility}"
+                        StyleClass="box-label-regular"
+                        HorizontalOptions="StartAndExpand" />
+                    <RelativeLayout HorizontalOptions="End">
+                        <Switch
+                            x:Name="AccessibilitySwitch"
+                            IsToggled="{Binding AccessibilityToggled}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                        <Button
+                            Command="{Binding ToggleAccessibilityCommand}"
+                            StyleClass="box-overlay"
+                            RelativeLayout.XConstraint="0"
+                            RelativeLayout.YConstraint="0"
+                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AccessibilitySwitch, Property=Width}"
+                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AccessibilitySwitch, Property=Height}" />
+                    </RelativeLayout>
+                </StackLayout>
+                <Label
+                    Text="{Binding AccessibilityDescriptionLabel}"
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+            </StackLayout>
+            <StackLayout 
+                StyleClass="box"
+                IsVisible="{Binding DrawOverVisible}">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n DrawOver}"
+                        StyleClass="box-label-regular"
+                        IsEnabled="{Binding DrawOverEnabled}"
+                        HorizontalOptions="StartAndExpand" />
+                    <RelativeLayout HorizontalOptions="End">
+                        <Switch
+                            x:Name="DrawOverSwitch"
+                            IsEnabled="{Binding DrawOverEnabled}"
+                            IsToggled="{Binding DrawOverToggled}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                        <Button
+                            Clicked="ToggleDrawOver"
+                            StyleClass="box-overlay"
+                            RelativeLayout.XConstraint="0"
+                            RelativeLayout.YConstraint="0"
+                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=DrawOverSwitch, Property=Width}"
+                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=DrawOverSwitch, Property=Height}" />
+                    </RelativeLayout>
+                </StackLayout>
+                <Label
+                    Text="{Binding DrawOverDescriptionLabel}"
+                    StyleClass="box-footer-label, box-footer-label-switch"
+                    IsEnabled="{Binding InlineAutofillEnabled}"/>
+            </StackLayout>
+        </StackLayout>
+    </ScrollView>
+
+</pages:BaseContentPage>
--- a/src/App/Pages/Settings/AutofillServicesPage.xaml.cs
+++ b/src/App/Pages/Settings/AutofillServicesPage.xaml.cs
@@ -0,0 +1,66 @@
+using System;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public partial class AutofillServicesPage : BaseContentPage
+    {
+        private readonly AutofillServicesPageViewModel _vm;
+        private readonly SettingsPage _settingsPage;
+        private DateTime? _timerStarted = null;
+        private TimeSpan _timerMaxLength = TimeSpan.FromMinutes(5);
+
+        public AutofillServicesPage(SettingsPage settingsPage)
+        {
+            InitializeComponent();
+            _vm = BindingContext as AutofillServicesPageViewModel;
+            _vm.Page = this;
+            _settingsPage = settingsPage;
+        }
+
+        protected async override void OnAppearing()
+        {
+            await _vm.InitAsync();
+            _vm.UpdateEnabled();
+            _timerStarted = DateTime.UtcNow;
+            Device.StartTimer(new TimeSpan(0, 0, 0, 0, 500), () =>
+            {
+                if (_timerStarted == null || (DateTime.UtcNow - _timerStarted) > _timerMaxLength)
+                {
+                    return false;
+                }
+                _vm.UpdateEnabled();
+                return true;
+            });
+            base.OnAppearing();
+        }
+
+        protected override void OnDisappearing()
+        {
+            _timerStarted = null;
+            _settingsPage.BuildList();
+            base.OnDisappearing();
+        }
+
+        private void ToggleAutofillService(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.ToggleAutofillService();
+            }
+        }
+
+        private void ToggleInlineAutofill(object sender, EventArgs e)
+        {
+            _vm.ToggleInlineAutofill();
+        }
+
+        private void ToggleDrawOver(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.ToggleDrawOver();
+            }
+        }
+    }
+}
--- a/src/App/Pages/Settings/AutofillServicesPageViewModel.cs
+++ b/src/App/Pages/Settings/AutofillServicesPageViewModel.cs
@@ -0,0 +1,231 @@
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.App.Services;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
+
+namespace Bit.App.Pages
+{
+    public class AutofillServicesPageViewModel : BaseViewModel
+    {
+        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;
+        private readonly IStateService _stateService;
+        private readonly MobileI18nService _i18nService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
+
+        private bool _autofillServiceToggled;
+        private bool _inlineAutofillToggled;
+        private bool _accessibilityToggled;
+        private bool _drawOverToggled;
+        private bool _inited;
+
+        public AutofillServicesPageViewModel()
+        {
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService;
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            PageTitle = AppResources.AutofillServices;
+            ToggleAccessibilityCommand = new AsyncCommand(ToggleAccessibilityAsync,
+                onException: ex => _logger.Value.Exception(ex),
+                allowsMultipleExecutions: false);
+        }
+
+        #region Autofill Service
+
+        public bool AutofillServiceVisible
+        {
+            get => _deviceActionService.SystemMajorVersion() >= 26;
+        }
+
+        public bool AutofillServiceToggled
+        {
+            get => _autofillServiceToggled;
+            set => SetProperty(ref _autofillServiceToggled, value,
+                additionalPropertyNames: new string[]
+                {
+                    nameof(InlineAutofillEnabled)
+                });
+        }
+
+        #endregion
+
+        #region Inline Autofill
+
+        public bool InlineAutofillVisible
+        {
+            get => _deviceActionService.SystemMajorVersion() >= 30;
+        }
+
+        public bool InlineAutofillEnabled
+        {
+            get => AutofillServiceToggled;
+        }
+
+        public bool InlineAutofillToggled
+        {
+            get => _inlineAutofillToggled;
+            set
+            {
+                if (SetProperty(ref _inlineAutofillToggled, value))
+                {
+                    var task = UpdateInlineAutofillToggledAsync();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Accessibility
+
+        public ICommand ToggleAccessibilityCommand { get; }
+
+        public string AccessibilityDescriptionLabel
+        {
+            get
+            {
+                if (_deviceActionService.SystemMajorVersion() <= 22)
+                {
+                    // Android 5
+                    return _i18nService.T("AccessibilityDescription");
+                }
+                if (_deviceActionService.SystemMajorVersion() == 23)
+                {
+                    // Android 6
+                    return _i18nService.T("AccessibilityDescription2");
+                }
+                if (_deviceActionService.SystemMajorVersion() == 24 || _deviceActionService.SystemMajorVersion() == 25)
+                {
+                    // Android 7
+                    return _i18nService.T("AccessibilityDescription3");
+                }
+                // Android 8+
+                return _i18nService.T("AccessibilityDescription4");
+            }
+        }
+
+        public bool AccessibilityToggled
+        {
+            get => _accessibilityToggled;
+            set => SetProperty(ref _accessibilityToggled, value,
+                additionalPropertyNames: new string[]
+                {
+                    nameof(DrawOverEnabled)
+                });
+        }
+
+        #endregion
+
+        #region Draw-Over
+
+        public bool DrawOverVisible
+        {
+            get => _deviceActionService.SystemMajorVersion() >= 23;
+        }
+
+        public string DrawOverDescriptionLabel
+        {
+            get
+            {
+                if (_deviceActionService.SystemMajorVersion() <= 23)
+                {
+                    // Android 6
+                    return _i18nService.T("DrawOverDescription");
+                }
+                if (_deviceActionService.SystemMajorVersion() == 24 || _deviceActionService.SystemMajorVersion() == 25)
+                {
+                    // Android 7
+                    return _i18nService.T("DrawOverDescription2");
+                }
+                // Android 8+
+                return _i18nService.T("DrawOverDescription3");
+            }
+        }
+
+        public bool DrawOverEnabled
+        {
+            get => AccessibilityToggled;
+        }
+
+        public bool DrawOverToggled
+        {
+            get => _drawOverToggled;
+            set => SetProperty(ref _drawOverToggled, value);
+        }
+
+        #endregion
+
+        public async Task InitAsync()
+        {
+            InlineAutofillToggled = await _stateService.GetInlineAutofillEnabledAsync() ?? true;
+            _inited = true;
+        }
+
+        public void ToggleAutofillService()
+        {
+            if (!AutofillServiceToggled)
+            {
+                _deviceActionService.OpenAutofillSettings();
+            }
+            else
+            {
+                _autofillHandler.DisableAutofillService();
+            }
+        }
+
+        public void ToggleInlineAutofill()
+        {
+            if (!InlineAutofillEnabled)
+            {
+                return;
+            }
+            InlineAutofillToggled = !InlineAutofillToggled;
+        }
+
+        public async Task ToggleAccessibilityAsync()
+        {
+            if (!_autofillHandler.AutofillAccessibilityServiceRunning())
+            {
+                var accept = await _platformUtilsService.ShowDialogAsync(AppResources.AccessibilityDisclosureText,
+                    AppResources.AccessibilityServiceDisclosure, AppResources.Accept,
+                    AppResources.Decline);
+                if (!accept)
+                {
+                    return;
+                }
+            }
+            _deviceActionService.OpenAccessibilitySettings();
+        }
+
+        public void ToggleDrawOver()
+        {
+            if (!DrawOverEnabled)
+            {
+                return;
+            }
+            _deviceActionService.OpenAccessibilityOverlayPermissionSettings();
+        }
+
+        public void UpdateEnabled()
+        {
+            AutofillServiceToggled =
+                _autofillHandler.SupportsAutofillService() && _autofillHandler.AutofillServiceEnabled();
+            AccessibilityToggled = _autofillHandler.AutofillAccessibilityServiceRunning();
+            DrawOverToggled = _autofillHandler.AutofillAccessibilityOverlayPermitted();
+        }
+
+        private async Task UpdateInlineAutofillToggledAsync()
+        {
+            if (_inited)
+            {
+                await _stateService.SetInlineAutofillEnabledAsync(InlineAutofillToggled);
+            }
+        }
+    }
+}
--- a/src/App/Pages/Settings/AutofillSettingsPage.xaml
+++ b/src/App/Pages/Settings/AutofillSettingsPage.xaml
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:AutofillSettingsPageViewModel"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:Class="Bit.App.Pages.AutofillSettingsPage"
-    Title="{u:I18n Autofill}">
-    
-    <ContentPage.BindingContext>
-        <pages:AutofillSettingsPageViewModel />
-    </ContentPage.BindingContext>
-
-     <ScrollView Padding="0, 0, 0, 20">
-        <StackLayout Padding="0" Spacing="5">
-            <controls:CustomLabel
-                Text="{u:I18n Autofill}"
-                StyleClass="settings-header" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n AutofillServices}"
-                Subtitle="{u:I18n AutofillServicesExplanationLong}"
-                IsVisible="{Binding SupportsAndroidAutofillServices}"
-                IsToggled="{Binding UseAutofillServices}"
-                AutomationId="AutofillServicesSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n InlineAutofill}"
-                Subtitle="{u:I18n UseInlineAutofillExplanationLong}"
-                IsToggled="{Binding UseInlineAutofill}"
-                IsVisible="{Binding ShowUseInlineAutofillToggle}"
-                IsEnabled="{Binding UseAutofillServices}"
-                AutomationId="InlineAutofillSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n Accessibility}"
-                Subtitle="{Binding UseAccessibilityDescription}"
-                IsToggled="{Binding UseAccessibility}"
-                IsVisible="{Binding ShowUseAccessibilityToggle}"
-                AutomationId="AccessibilitySwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n DrawOver}"
-                Subtitle="{Binding UseDrawOverDescription}"
-                IsToggled="{Binding UseDrawOver}"
-                IsVisible="{Binding ShowUseDrawOverToggle}"
-                IsEnabled="{Binding UseAccessibility}"
-                AutomationId="DrawOverSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:CustomLabel
-                Text="{u:I18n PasswordAutofill}"
-                StyleClass="settings-navigatable-label"
-                IsVisible="{Binding SupportsiOSAutofill}"
-                AutomationId="PasswordAutofillLabel">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding GoToPasswordAutofillCommand}" />
-                </Label.GestureRecognizers>
-            </controls:CustomLabel>
-
-            <controls:CustomLabel
-                Text="{u:I18n AppExtension}"
-                StyleClass="settings-navigatable-label"
-                IsVisible="{OnPlatform iOS=True, Android=False}"
-                AutomationId="AppExtensionLabel">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding GoToAppExtensionCommand}" />
-                </Label.GestureRecognizers>
-            </controls:CustomLabel>
-
-            <BoxView StyleClass="settings-box-row-separator" />
-
-            <controls:CustomLabel
-                Text="{u:I18n AdditionalOptions}"
-                StyleClass="settings-header" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n CopyTotpAutomatically}"
-                Subtitle="{u:I18n CopyTotpAutomaticallyDescription}"
-                IsToggled="{Binding CopyTotpAutomatically}"
-                AutomationId="CopyTotpAutomaticallySwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-            
-            <controls:SwitchItemView
-                Title="{u:I18n AskToAddLogin}"
-                Subtitle="{u:I18n AskToAddLoginDescription}"
-                IsToggled="{Binding AskToAddLogin}"
-                IsVisible="{Binding SupportsAndroidAutofillServices}"
-                AutomationId="AskToAddLoginSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:SettingChooserItemView
-                Title="{u:I18n DefaultUriMatchDetection}"
-                Subtitle="{u:I18n DefaultUriMatchDetectionDescription}"
-                DisplayValue="{Binding DefaultUriMatchDetectionPickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding DefaultUriMatchDetectionPickerViewModel.SelectOptionCommand}"
-                AutomationId="DefaultUriMatchDetectionChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-
-            <StackLayout
-                Spacing="0"
-                Padding="16,12"
-                IsVisible="{Binding SupportsAndroidAutofillServices}"
-                AutomationId="BlockAutoFillView">
-                <StackLayout.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding GoToBlockAutofillUrisCommand}" />
-                </StackLayout.GestureRecognizers>
-                <controls:CustomLabel
-                    MaxLines="2"
-                    Text="{u:I18n BlockAutoFill}"
-                    HorizontalOptions="StartAndExpand"
-                    LineBreakMode="TailTruncation" />
-                <Label
-                    Text="{u:I18n AutoFillWillNotBeOfferedForTheseURIs}"
-                    StyleClass="box-footer-label, box-footer-label-switch"
-                    Margin="0,0,0,0"/>
-            </StackLayout>
-
-        </StackLayout>
-    </ScrollView>
-</pages:BaseContentPage>
--- a/src/App/Pages/Settings/AutofillSettingsPage.xaml.cs
+++ b/src/App/Pages/Settings/AutofillSettingsPage.xaml.cs
@@ -1,37 +0,0 @@
-using System;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public partial class AutofillSettingsPage : BaseContentPage
-    {
-        AutofillSettingsPageViewModel _vm;
-
-        public AutofillSettingsPage()
-        {
-            InitializeComponent();
-            _vm = BindingContext as AutofillSettingsPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            try
-            {
-                await _vm.InitAsync();
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                ServiceContainer.Resolve<IPlatformUtilsService>().ShowToast(null, null, AppResources.AnErrorHasOccurred);
-
-                Navigation.PopAsync().FireAndForget();
-            }
-        }
-    }
-}
--- a/src/App/Pages/Settings/AutofillSettingsPageViewModel.android.cs
+++ b/src/App/Pages/Settings/AutofillSettingsPageViewModel.android.cs
@@ -1,181 +0,0 @@
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Resources;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class AutofillSettingsPageViewModel
-    {
-        private bool _useAutofillServices;
-        private bool _useInlineAutofill;
-        private bool _useAccessibility;
-        private bool _useDrawOver;
-        private bool _askToAddLogin;
-
-        public bool SupportsAndroidAutofillServices => Device.RuntimePlatform == Device.Android && _deviceActionService.SupportsAutofillServices();
-
-        public bool UseAutofillServices
-        {
-            get => _useAutofillServices;
-            set
-            {
-                if (SetProperty(ref _useAutofillServices, value))
-                {
-                    ((ICommand)ToggleUseAutofillServicesCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool ShowUseInlineAutofillToggle => _deviceActionService.SupportsInlineAutofill();
-
-        public bool UseInlineAutofill
-        {
-            get => _useInlineAutofill;
-            set
-            {
-                if (SetProperty(ref _useInlineAutofill, value))
-                {
-                    ((ICommand)ToggleUseInlineAutofillCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool ShowUseAccessibilityToggle => Device.RuntimePlatform == Device.Android;
-
-        public string UseAccessibilityDescription => _deviceActionService.GetAutofillAccessibilityDescription();
-
-        public bool UseAccessibility
-        {
-            get => _useAccessibility;
-            set
-            {
-                if (SetProperty(ref _useAccessibility, value))
-                {
-                    ((ICommand)ToggleUseAccessibilityCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool ShowUseDrawOverToggle => _deviceActionService.SupportsDrawOver();
-
-        public bool UseDrawOver
-        {
-            get => _useDrawOver;
-            set
-            {
-                if (SetProperty(ref _useDrawOver, value))
-                {
-                    ((ICommand)ToggleUseDrawOverCommand).Execute(null);
-                }
-            }
-        }
-
-        public string UseDrawOverDescription => _deviceActionService.GetAutofillDrawOverDescription();
-
-        public bool AskToAddLogin
-        {
-            get => _askToAddLogin;
-            set
-            {
-                if (SetProperty(ref _askToAddLogin, value))
-                {
-                    ((ICommand)ToggleAskToAddLoginCommand).Execute(null);
-                }
-            }
-        }
-
-        public AsyncCommand ToggleUseAutofillServicesCommand { get; private set; }
-        public AsyncCommand ToggleUseInlineAutofillCommand { get; private set; }
-        public AsyncCommand ToggleUseAccessibilityCommand { get; private set; }
-        public AsyncCommand ToggleUseDrawOverCommand { get; private set; }
-        public AsyncCommand ToggleAskToAddLoginCommand { get; private set; }
-        public ICommand GoToBlockAutofillUrisCommand { get; private set; }
-
-        private void InitAndroidCommands()
-        {
-            ToggleUseAutofillServicesCommand = CreateDefaultAsyncCommnad(() => MainThread.InvokeOnMainThreadAsync(() => ToggleUseAutofillServices()), _ => _inited);
-            ToggleUseInlineAutofillCommand = CreateDefaultAsyncCommnad(() => MainThread.InvokeOnMainThreadAsync(() => ToggleUseInlineAutofillEnabledAsync()), _ => _inited);
-            ToggleUseAccessibilityCommand = CreateDefaultAsyncCommnad(ToggleUseAccessibilityAsync, _ => _inited);
-            ToggleUseDrawOverCommand = CreateDefaultAsyncCommnad(() => MainThread.InvokeOnMainThreadAsync(() => ToggleDrawOver()), _ => _inited);
-            ToggleAskToAddLoginCommand = CreateDefaultAsyncCommnad(ToggleAskToAddLoginAsync, _ => _inited);
-            GoToBlockAutofillUrisCommand = CreateDefaultAsyncCommnad(() => Page.Navigation.PushAsync(new BlockAutofillUrisPage()));
-        }
-
-        private async Task InitAndroidAutofillSettingsAsync()
-        {
-            _useInlineAutofill = await _stateService.GetInlineAutofillEnabledAsync() ?? true;
-
-            await UpdateAndroidAutofillSettingsAsync();
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                TriggerPropertyChanged(nameof(UseInlineAutofill));
-            });
-        }
-
-        private async Task UpdateAndroidAutofillSettingsAsync()
-        {
-            _useAutofillServices =
-                _autofillHandler.SupportsAutofillService() && _autofillHandler.AutofillServiceEnabled();
-            _useAccessibility = _autofillHandler.AutofillAccessibilityServiceRunning();
-            _useDrawOver = _autofillHandler.AutofillAccessibilityOverlayPermitted();
-            _askToAddLogin = await _stateService.GetAutofillDisableSavePromptAsync() != true;
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                TriggerPropertyChanged(nameof(UseAutofillServices));
-                TriggerPropertyChanged(nameof(UseAccessibility));
-                TriggerPropertyChanged(nameof(UseDrawOver));
-                TriggerPropertyChanged(nameof(AskToAddLogin));
-            });
-        }
-
-        private void ToggleUseAutofillServices()
-        {
-            if (UseAutofillServices)
-            {
-                _deviceActionService.OpenAutofillSettings();
-            }
-            else
-            {
-                _autofillHandler.DisableAutofillService();
-            }
-        }
-
-        private async Task ToggleUseInlineAutofillEnabledAsync()
-        {
-            await _stateService.SetInlineAutofillEnabledAsync(UseInlineAutofill);
-        }
-
-        private async Task ToggleUseAccessibilityAsync()
-        {
-            if (!_autofillHandler.AutofillAccessibilityServiceRunning()
-                &&
-                !await _platformUtilsService.ShowDialogAsync(AppResources.AccessibilityDisclosureText, AppResources.AccessibilityServiceDisclosure,
-                    AppResources.Accept, AppResources.Decline))
-            {
-                _useAccessibility = false;
-                await MainThread.InvokeOnMainThreadAsync(() => TriggerPropertyChanged(nameof(UseAccessibility)));
-                return;
-            }
-            _deviceActionService.OpenAccessibilitySettings();
-        }
-
-        private void ToggleDrawOver()
-        {
-            if (!UseAccessibility)
-            {
-                return;
-            }
-            _deviceActionService.OpenAccessibilityOverlayPermissionSettings();
-        }
-
-        private async Task ToggleAskToAddLoginAsync()
-        {
-            await _stateService.SetAutofillDisableSavePromptAsync(!AskToAddLogin);
-        }
-    }
-}
--- a/src/App/Pages/Settings/AutofillSettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/AutofillSettingsPageViewModel.cs
@@ -1,111 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-
-namespace Bit.App.Pages
-{
-    public partial class AutofillSettingsPageViewModel : BaseViewModel
-    {
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IAutofillHandler _autofillHandler;
-        private readonly IStateService _stateService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-
-        private bool _inited;
-        private bool _copyTotpAutomatically;
-
-        public AutofillSettingsPageViewModel()
-        {
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-
-            DefaultUriMatchDetectionPickerViewModel = new PickerViewModel<UriMatchType>(
-                _deviceActionService,
-                ServiceContainer.Resolve<ILogger>(),
-                DefaultUriMatchDetectionChangingAsync,
-                AppResources.DefaultUriMatchDetection,
-                _ => _inited,
-                ex => HandleException(ex));
-
-            ToggleCopyTotpAutomaticallyCommand = CreateDefaultAsyncCommnad(ToggleCopyTotpAutomaticallyAsync, _ => _inited);
-
-            InitAndroidCommands();
-            InitIOSCommands();
-        }
-
-        public bool CopyTotpAutomatically
-        {
-            get => _copyTotpAutomatically;
-            set
-            {
-                if (SetProperty(ref _copyTotpAutomatically, value))
-                {
-                    ((ICommand)ToggleCopyTotpAutomaticallyCommand).Execute(null);
-                }
-            }
-        }
-
-        public PickerViewModel<UriMatchType> DefaultUriMatchDetectionPickerViewModel { get; }
-
-        public AsyncCommand ToggleCopyTotpAutomaticallyCommand { get; private set; }
-
-        public async Task InitAsync()
-        {
-            await InitAndroidAutofillSettingsAsync();
-
-            _copyTotpAutomatically = await _stateService.GetDisableAutoTotpCopyAsync() != true;
-
-            await InitDefaultUriMatchDetectionPickerViewModelAsync();
-
-            _inited = true;
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                TriggerPropertyChanged(nameof(CopyTotpAutomatically));
-
-                ToggleUseAutofillServicesCommand.RaiseCanExecuteChanged();
-                ToggleUseInlineAutofillCommand.RaiseCanExecuteChanged();
-                ToggleUseAccessibilityCommand.RaiseCanExecuteChanged();
-                ToggleUseDrawOverCommand.RaiseCanExecuteChanged();
-                DefaultUriMatchDetectionPickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-            });
-        }
-
-        private async Task InitDefaultUriMatchDetectionPickerViewModelAsync()
-        {
-            var options = new Dictionary<UriMatchType, string>
-            {
-                [UriMatchType.Domain] = AppResources.BaseDomain,
-                [UriMatchType.Host] = AppResources.Host,
-                [UriMatchType.StartsWith] = AppResources.StartsWith,
-                [UriMatchType.RegularExpression] = AppResources.RegEx,
-                [UriMatchType.Exact] = AppResources.Exact,
-                [UriMatchType.Never] = AppResources.Never
-            };
-
-            var defaultUriMatchDetection = ((UriMatchType?)await _stateService.GetDefaultUriMatchAsync()) ?? UriMatchType.Domain;
-
-            DefaultUriMatchDetectionPickerViewModel.Init(options, defaultUriMatchDetection, UriMatchType.Domain);
-        }
-
-        private async Task ToggleCopyTotpAutomaticallyAsync()
-        {
-            await _stateService.SetDisableAutoTotpCopyAsync(!CopyTotpAutomatically);
-        }
-
-        private async Task<bool> DefaultUriMatchDetectionChangingAsync(UriMatchType type)
-        {
-            await _stateService.SetDefaultUriMatchAsync((int?)type);
-            return true;
-        }
-    }
-}
--- a/src/App/Pages/Settings/AutofillSettingsPageViewModel.ios.cs
+++ b/src/App/Pages/Settings/AutofillSettingsPageViewModel.ios.cs
@@ -1,19 +0,0 @@
-using System.Windows.Input;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class AutofillSettingsPageViewModel
-    {
-        public bool SupportsiOSAutofill => Device.RuntimePlatform == Device.iOS && _deviceActionService.SupportsAutofillServices();
-
-        public ICommand GoToPasswordAutofillCommand { get; private set; }
-        public ICommand GoToAppExtensionCommand { get; private set; }
-
-        private void InitIOSCommands()
-        {
-            GoToPasswordAutofillCommand = CreateDefaultAsyncCommnad(() => Page.Navigation.PushModalAsync(new NavigationPage(new AutofillPage())));
-            GoToAppExtensionCommand = CreateDefaultAsyncCommnad(() => Page.Navigation.PushModalAsync(new NavigationPage(new ExtensionPage())));
-        }
-    }
-}
--- a/src/App/Pages/Settings/BlockAutofillUrisPage.xaml
+++ b/src/App/Pages/Settings/BlockAutofillUrisPage.xaml
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BaseContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.BlockAutofillUrisPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:DataType="pages:BlockAutofillUrisPageViewModel"
-    NavigationPage.HasBackButton="False"
-    Title="{u:I18n BlockAutoFill}">
-    <ContentPage.BindingContext>
-        <pages:BlockAutofillUrisPageViewModel />
-    </ContentPage.BindingContext>
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-        </ResourceDictionary>
-    </ContentPage.Resources>
-    <StackLayout Orientation="Vertical">
-        <Image
-            x:Name="_emptyUrisPlaceholder"
-            HorizontalOptions="Center"
-            WidthRequest="120"
-            HeightRequest="120"
-            Margin="0,100,0,0"
-            IsVisible="{Binding ShowList, Converter={StaticResource inverseBool}}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n ThereAreNoBlockedURIs}" />
-        <controls:CustomLabel
-            StyleClass="box-label-regular"
-            Text="{u:I18n AutoFillWillNotBeOfferedForTheseURIs}"
-            FontWeight="500"
-            HorizontalTextAlignment="Center"
-            Margin="14,10,14,0"/>
-        <controls:ExtendedCollectionView
-            ItemsSource="{Binding BlockedUris}"
-            IsVisible="{Binding ShowList}"
-            VerticalOptions="FillAndExpand"
-            Margin="0,5,0,0"
-            SelectionMode="None"
-            StyleClass="list, list-platform"
-            ExtraDataForLogging="Blocked Autofill Uris"
-            AutomationId="BlockedUrisCellList">
-            <CollectionView.ItemTemplate>
-                <DataTemplate x:DataType="pages:BlockAutofillUriItemViewModel">
-                    <StackLayout
-                        Orientation="Vertical"
-                        AutomationId="BlockedUriCell">
-                        <StackLayout
-                            Orientation="Horizontal">
-                            <controls:CustomLabel
-                                VerticalOptions="Center"
-                                StyleClass="box-label-regular"
-                                Text="{Binding Uri}"
-                                MaxLines="2"
-                                LineBreakMode="TailTruncation"
-                                FontWeight="500"
-                                Margin="15,0,0,0"
-                                HorizontalOptions="StartAndExpand"/>
-                            <controls:IconButton
-                                StyleClass="box-row-button-muted, box-row-button-platform"
-                                Text="{Binding Source={x:Static core:BitwardenIcons.PencilSquare}}"
-                                Command="{Binding EditUriCommand}"
-                                Margin="5,0,15,0"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n EditURI}"
-                                AutomationId="EditUriButton" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                    </StackLayout>
-                </DataTemplate>
-            </CollectionView.ItemTemplate>
-        </controls:ExtendedCollectionView>
-        <Button
-            Text="{u:I18n NewBlockedURI}"
-            Command="{Binding AddUriCommand}"
-            VerticalOptions="End"
-            HeightRequest="40"
-            Opacity="0.8"
-            Margin="14,5,14,10"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n NewBlockedURI}"
-            AutomationId="NewBlockedUriButton" />
-    </StackLayout>
-</pages:BaseContentPage>
--- a/src/App/Pages/Settings/BlockAutofillUrisPage.xaml.cs
+++ b/src/App/Pages/Settings/BlockAutofillUrisPage.xaml.cs
@@ -1,44 +0,0 @@
-using System.Threading.Tasks;
-using Bit.App.Styles;
-using Bit.App.Utilities;
-using Bit.Core.Utilities;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class BlockAutofillUrisPage : BaseContentPage, IThemeDirtablePage
-    {
-        private readonly BlockAutofillUrisPageViewModel _vm;
-
-        public BlockAutofillUrisPage()
-        {
-            InitializeComponent();
-
-            _vm = BindingContext as BlockAutofillUrisPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            _vm.InitAsync().FireAndForget(_ => Navigation.PopAsync());
-
-            UpdatePlaceholder();
-        }
-
-        public override async Task UpdateOnThemeChanged()
-        {
-            await base.UpdateOnThemeChanged();
-
-            UpdatePlaceholder();
-        }
-
-        private void UpdatePlaceholder()
-        {
-            MainThread.BeginInvokeOnMainThread(() =>
-                _emptyUrisPlaceholder.Source = ImageSource.FromFile(ThemeManager.UsingLightTheme ? "empty_uris_placeholder" : "empty_uris_placeholder_dark"));
-        }
-    }
-}
--- a/src/App/Pages/Settings/BlockAutofillUrisPageViewModel.cs
+++ b/src/App/Pages/Settings/BlockAutofillUrisPageViewModel.cs
@@ -1,186 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class BlockAutofillUrisPageViewModel : BaseViewModel
-    {
-        private const char URI_SEPARARTOR = ',';
-        private const string URI_FORMAT = "https://domain.com";
-
-        private readonly IStateService _stateService;
-        private readonly IDeviceActionService _deviceActionService;
-
-        public BlockAutofillUrisPageViewModel()
-        {
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-
-            AddUriCommand = new AsyncCommand(AddUriAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            EditUriCommand = new AsyncCommand<BlockAutofillUriItemViewModel>(EditUriAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        public ObservableRangeCollection<BlockAutofillUriItemViewModel> BlockedUris { get; set; } = new ObservableRangeCollection<BlockAutofillUriItemViewModel>();
-
-        public bool ShowList => BlockedUris.Any();
-
-        public ICommand AddUriCommand { get; }
-
-        public ICommand EditUriCommand { get; }
-
-        public async Task InitAsync()
-        {
-            var blockedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
-            if (blockedUrisList?.Any() != true)
-            {
-                return;
-            }
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                BlockedUris.AddRange(blockedUrisList.OrderBy(uri => uri).Select(u => new BlockAutofillUriItemViewModel(u, EditUriCommand)).ToList());
-                TriggerPropertyChanged(nameof(ShowList));
-            });
-        }
-
-        private async Task AddUriAsync()
-        {
-            var response = await _deviceActionService.DisplayValidatablePromptAsync(new Utilities.Prompts.ValidatablePromptConfig
-            {
-                Title = AppResources.NewUri,
-                Subtitle = AppResources.EnterURI,
-                ValueSubInfo = string.Format(AppResources.FormatXSeparateMultipleURIsWithAComma, URI_FORMAT),
-                OkButtonText = AppResources.Save,
-                ValidateText = text => ValidateUris(text, true)
-            });
-            if (response?.Text is null)
-            {
-                return;
-            }
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                foreach (var uri in response.Value.Text.Split(URI_SEPARARTOR).Where(s => !string.IsNullOrEmpty(s)))
-                {
-                    var cleanedUri = uri.Replace(Environment.NewLine, string.Empty).Trim();
-                    BlockedUris.Add(new BlockAutofillUriItemViewModel(cleanedUri, EditUriCommand));
-                }
-
-                BlockedUris = new ObservableRangeCollection<BlockAutofillUriItemViewModel>(BlockedUris.OrderBy(b => b.Uri));
-                TriggerPropertyChanged(nameof(BlockedUris));
-                TriggerPropertyChanged(nameof(ShowList));
-            });
-            await UpdateAutofillBlacklistedUrisAsync();
-            _deviceActionService.Toast(AppResources.URISaved);
-        }
-
-        private async Task EditUriAsync(BlockAutofillUriItemViewModel uriItemViewModel)
-        {
-            var response = await _deviceActionService.DisplayValidatablePromptAsync(new Utilities.Prompts.ValidatablePromptConfig
-            {
-                Title = AppResources.EditURI,
-                Subtitle = AppResources.EnterURI,
-                Text = uriItemViewModel.Uri,
-                ValueSubInfo = string.Format(AppResources.FormatX, URI_FORMAT),
-                OkButtonText = AppResources.Save,
-                ThirdButtonText = AppResources.Remove,
-                ValidateText = text => ValidateUris(text, false)
-            });
-            if (response is null)
-            {
-                return;
-            }
-
-            if (response.Value.ExecuteThirdAction)
-            {
-                await MainThread.InvokeOnMainThreadAsync(() =>
-                {
-                    BlockedUris.Remove(uriItemViewModel);
-                    TriggerPropertyChanged(nameof(ShowList));
-                });
-                await UpdateAutofillBlacklistedUrisAsync();
-                _deviceActionService.Toast(AppResources.URIRemoved);
-                return;
-            }
-
-            var cleanedUri = response.Value.Text.Replace(Environment.NewLine, string.Empty).Trim();
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                BlockedUris.Remove(uriItemViewModel);
-                BlockedUris.Add(new BlockAutofillUriItemViewModel(cleanedUri, EditUriCommand));
-                BlockedUris = new ObservableRangeCollection<BlockAutofillUriItemViewModel>(BlockedUris.OrderBy(b => b.Uri));
-                TriggerPropertyChanged(nameof(BlockedUris));
-                TriggerPropertyChanged(nameof(ShowList));
-            });
-            await UpdateAutofillBlacklistedUrisAsync();
-            _deviceActionService.Toast(AppResources.URISaved);
-        }
-
-        private string ValidateUris(string uris, bool allowMultipleUris)
-        {
-            if (string.IsNullOrWhiteSpace(uris))
-            {
-                return string.Format(AppResources.FormatX, URI_FORMAT);
-            }
-
-            if (!allowMultipleUris && uris.Contains(URI_SEPARARTOR))
-            {
-                return AppResources.CannotEditMultipleURIsAtOnce;
-            }
-
-            foreach (var uri in uris.Split(URI_SEPARARTOR).Where(u => !string.IsNullOrWhiteSpace(u)))
-            {
-                var cleanedUri = uri.Replace(Environment.NewLine, string.Empty).Trim();
-                if (!cleanedUri.StartsWith("http://") && !cleanedUri.StartsWith("https://") &&
-                    !cleanedUri.StartsWith(Constants.AndroidAppProtocol))
-                {
-                    return AppResources.InvalidFormatUseHttpsHttpOrAndroidApp;
-                }
-
-                if (!Uri.TryCreate(cleanedUri, UriKind.Absolute, out var _))
-                {
-                    return AppResources.InvalidURI;
-                }
-
-                if (BlockedUris.Any(uriItem => uriItem.Uri == cleanedUri))
-                {
-                    return string.Format(AppResources.TheURIXIsAlreadyBlocked, cleanedUri);
-                }
-            }
-
-            return null;
-        }
-
-        private async Task UpdateAutofillBlacklistedUrisAsync()
-        {
-            await _stateService.SetAutofillBlacklistedUrisAsync(BlockedUris.Any() ? BlockedUris.Select(bu => bu.Uri).ToList() : null);
-        }
-    }
-
-    public class BlockAutofillUriItemViewModel : ExtendedViewModel
-    {
-        public BlockAutofillUriItemViewModel(string uri, ICommand editUriCommand)
-        {
-            Uri = uri;
-            EditUriCommand = new Command(() => editUriCommand.Execute(this));
-        }
-
-        public string Uri { get; }
-
-        public ICommand EditUriCommand { get; }
-    }
-}
--- a/src/App/Pages/Settings/ExportVaultPage.xaml
+++ b/src/App/Pages/Settings/ExportVaultPage.xaml
@@ -38,8 +38,7 @@
                <Label
                    Text="{u:I18n DisablePersonalVaultExportPolicyInEffect}"
                    StyleClass="text-muted, text-sm, text-bold"
-                    HorizontalTextAlignment="Center"
-                    AutomationId="DisablePrivateVaultPolicyLabel" />
+                    HorizontalTextAlignment="Center" />
            </Frame>
            <Grid
                RowSpacing="10"
@@ -56,8 +55,7 @@
                        SelectedIndex="{Binding FileFormatSelectedIndex}"
                        SelectedIndexChanged="FileFormat_Changed"
                        StyleClass="box-value"
-                        IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"
-                        AutomationId="FileFormatPicker" />
+                        IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}" />
                </StackLayout>
                <StackLayout
                    StyleClass="box-row"
@@ -74,8 +72,7 @@
                        HorizontalOptions="Fill"
                        VerticalOptions="End"
                        IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"
-                        Margin="0,0,0,10"
-                        AutomationId="SendTOTPCodeButton" />
+                        Margin="0,0,0,10"/>
                </StackLayout>
                <Grid
                    StyleClass="box-row"
@@ -99,8 +96,7 @@
                        Grid.Row="1"
                        Grid.Column="0"
                        ReturnType="Go"
-                        ReturnCommand="{Binding ExportVaultCommand}"
-                        AutomationId="MasterPasswordEntry" />
+                        ReturnCommand="{Binding ExportVaultCommand}" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -110,8 +106,7 @@
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        IsVisible="{Binding UseOTPVerification, Converter={StaticResource inverseBool}}"
-                        AutomationId="TogglePasswordVisibilityButton" />
+                        IsVisible="{Binding UseOTPVerification, Converter={StaticResource inverseBool}}"/>
                    <Label
                        Text="{u:I18n ConfirmYourIdentity}"
                        StyleClass="box-footer-label"
@@ -133,8 +128,7 @@
                    Clicked="ExportVault_Clicked"
                    HorizontalOptions="Fill"
                    VerticalOptions="End"
-                    IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"
-                    AutomationId="ExportVaultButton" />
+                    IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"/>
            </StackLayout>
        </StackLayout>
    </ScrollView>
--- a/src/App/Pages/Settings/ExportVaultPageViewModel.cs
+++ b/src/App/Pages/Settings/ExportVaultPageViewModel.cs
@@ -21,6 +21,7 @@ namespace Bit.App.Pages
        private readonly II18nService _i18nService;
        private readonly IExportService _exportService;
        private readonly IPolicyService _policyService;
+        private readonly IKeyConnectorService _keyConnectorService;
        private readonly IUserVerificationService _userVerificationService;
        private readonly IApiService _apiService;
        private readonly ILogger _logger;
@@ -44,7 +45,8 @@ namespace Bit.App.Pages
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
            _exportService = ServiceContainer.Resolve<IExportService>("exportService");
            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
+            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
+            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>("userVerificationService");
            _apiService = ServiceContainer.Resolve<IApiService>("apiService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");

@@ -65,7 +67,7 @@ namespace Bit.App.Pages
            _initialized = true;
            FileFormatSelectedIndex = FileFormatOptions.FindIndex(k => k.Key == "json");
            DisablePrivateVaultPolicyEnabled = await _policyService.PolicyAppliesToUser(PolicyType.DisablePersonalVaultExport);
-            UseOTPVerification = !await _userVerificationService.HasMasterPasswordAsync(true);
+            UseOTPVerification = await _keyConnectorService.GetUsesKeyConnector();

            if (UseOTPVerification)
            {
@@ -163,9 +165,9 @@ namespace Bit.App.Pages
                return;
            }

-            var verificationType = await _userVerificationService.HasMasterPasswordAsync(true)
-                ? VerificationType.MasterPassword
-                : VerificationType.OTP;
+            var verificationType = await _keyConnectorService.GetUsesKeyConnector()
+                ? VerificationType.OTP
+                : VerificationType.MasterPassword;
            if (!await _userVerificationService.VerifyUser(Secret, verificationType))
            {
                return;
--- a/src/App/Pages/Settings/LoginPasswordlessRequestsListPage.xaml
+++ b/src/App/Pages/Settings/LoginPasswordlessRequestsListPage.xaml
@@ -23,7 +23,6 @@
    <ContentPage.Resources>
        <ResourceDictionary>
            <u:DateTimeConverter x:Key="dateTime" />
-            <u:InverseBoolConverter x:Key="inverseBool" />
            <xct:ItemSelectedEventArgsConverter x:Key="ItemSelectedEventArgsConverter" />
            <controls:SelectionChangedEventArgsConverter x:Key="SelectionChangedEventArgsConverter" />
            <DataTemplate
@@ -33,8 +32,7 @@
                        Padding="10, 0"
                        RowSpacing="0"
                        RowDefinitions="*, Auto, *, 10"
-                        ColumnDefinitions="*, *"
-                        AutomationId="LoginRequestCell">
+                        ColumnDefinitions="*, *">
                        <Label
                            Text="{u:I18n FingerprintPhrase}"
                            FontSize="Small"
@@ -47,23 +45,20 @@
                            FontSize="Small"
                            Padding="0, 5, 0, 10"
                            VerticalTextAlignment="Center"
-                            TextColor="{DynamicResource FingerprintPhrase}"
-                            AutomationId="FingerprintPhraseLabel" />
+                            TextColor="{DynamicResource FingerprintPhrase}"/>
                        <Label
                            Grid.Row="2"
                            HorizontalOptions="Start"
                            HorizontalTextAlignment="Start"
                            Text="{Binding RequestDeviceType}"
-                            StyleClass="list-header-sub"
-                            AutomationId="RequestDeviceLabel" />
+                            StyleClass="list-header-sub" />
                        <Label
                            Grid.Row="2"
                            Grid.Column="1"
                            HorizontalOptions="End"
                            HorizontalTextAlignment="End"
                            Text="{Binding CreationDate, Converter={StaticResource dateTime}}"
-                            StyleClass="list-header-sub"
-                            AutomationId="RequestDateLabel" />
+                            StyleClass="list-header-sub" />
                        <BoxView
                            StyleClass="list-section-separator-top, list-section-separator-top-platform"
                            VerticalOptions="End"
@@ -81,29 +76,10 @@
                    Command="{Binding RefreshCommand}"
                    VerticalOptions="FillAndExpand"
                    BackgroundColor="{DynamicResource BackgroundColor}">
-                    <StackLayout>
-                        <Image
-                            x:Name="_emptyPlaceholder"
-                            Source="empty_login_requests"
-                            HorizontalOptions="Center"
-                            WidthRequest="160"
-                            HeightRequest="160"
-                            Margin="0,70,0,0"
-                            IsVisible="{Binding HasLoginRequests, Converter={StaticResource inverseBool}}"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n NoPendingRequests}" />
-                        <controls:CustomLabel
-                            StyleClass="box-label-regular"
-                            Text="{u:I18n NoPendingRequests}"
-                            FontAttributes="{OnPlatform iOS=Bold}"
-                            FontWeight="500"
-                            HorizontalTextAlignment="Center"
-                            Margin="14,10,14,0"/>
                    <controls:ExtendedCollectionView
                        ItemsSource="{Binding LoginRequests}"
                        ItemTemplate="{StaticResource loginRequestTemplate}"
                        SelectionMode="Single"
-                            IsVisible="{Binding HasLoginRequests}"
                        ExtraDataForLogging="Login requests page" >
                        <controls:ExtendedCollectionView.Behaviors>
                            <xct:EventToCommandBehavior
@@ -112,16 +88,13 @@
                                EventArgsConverter="{StaticResource SelectionChangedEventArgsConverter}" />
                        </controls:ExtendedCollectionView.Behaviors>
                    </controls:ExtendedCollectionView>
-                    </StackLayout>
                </RefreshView>
                <controls:IconLabelButton
                        VerticalOptions="End"
                        Margin="10,0"
                        Icon="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
                        Label="{u:I18n DeclineAllRequests}"
-                        ButtonCommand="{Binding DeclineAllRequestsCommand}"
-                        IsVisible="{Binding HasLoginRequests}"
-                        AutomationId="DeleteAllRequestsButton" />
+                        ButtonCommand="{Binding DeclineAllRequestsCommand}"/>
            </StackLayout>
        </ResourceDictionary>
    </ContentPage.Resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
André Bispo	2014d7f562	[PM-2287] Add trust device to master password unlock. Change trust device method. Remove email from SSO login page.	2023-07-10 19:37:32 +01:00
André Bispo	8a399235f4	code format	2023-07-10 18:36:36 +01:00
André Bispo	ce55750e60	[PM-2293] Trust device after admin request login.	2023-07-10 15:34:54 +01:00
André Bispo	a15269bafe	[PM-2293] Change boolean variable expression.	2023-07-10 13:44:26 +01:00
André Bispo	8a59e17fc9	Merge branch 'feature/pm-1208-f3-options' into feature/pm-2293-admin-approval	2023-07-10 12:37:31 +01:00
André Bispo	548bd12a8e	Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options	2023-07-10 12:37:13 +01:00
André Bispo	58542fd255	Merge branch 'master' into feature/pm-1029-tde-login	2023-07-10 12:36:59 +01:00
André Bispo	fc300f3e3f	Merge branch 'feature/pm-1208-f3-options' into feature/pm-2293-admin-approval # Conflicts: # src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs # src/App/Resources/AppResources.resx	2023-07-10 12:36:22 +01:00
André Bispo	800b4c71de	Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options # Conflicts: # src/Core/Models/Response/DeviceResponse.cs # src/Core/Services/ApiService.cs	2023-07-10 12:32:27 +01:00
André Bispo	7bcf1c377f	[PM-2293] Refactor AuthRequestType enum. Add label. Remove unnecessary actions.	2023-07-07 17:09:13 +01:00
Jake Fink	3053eaa036	[PM-1379] add DeviceTrustCryptoService with establish trust logic (#2535 ) * [PM-1379] add DeviceCryptoService with establish trust logic * PM-1379 update api location and other minor refactors * pm-1379 fix encoding * update trusted device keys api call to Put * [PM-1379] rename DeviceCryptoService to DeviceTrustCryptoService - refactors to prevent side effects * [PM-1379] rearrange methods in DeviceTrustCryptoService * [PM-1379] rearrange methods in abstraction * [PM-1379] deconstruct tuples * [PM-1379] remove extra tasks	2023-07-05 16:13:20 -04:00
André Bispo	109a84607a	[PM-2293] Change screen text based on AuthRequestType	2023-07-05 09:36:31 +01:00
André Bispo	d2b6c73a75	[PM-2293] Add Actions to ApproveWithDevicePage	2023-07-05 08:43:00 +01:00
André Bispo	9dc6a725cf	[PM-2293] Add AuthRequestType to PasswordlessLoginPage.	2023-07-05 08:42:17 +01:00
André Bispo	6268f0776b	Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options	2023-07-03 10:34:53 +01:00
André Bispo	cbbc41be67	[PM-1208] Add continue button and not you option	2023-07-03 10:34:02 +01:00
André Bispo	e164fb9823	Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options # Conflicts: # src/App/Resources/AppResources.resx # src/Core/Abstractions/IApiService.cs # src/Core/Services/StateService.cs	2023-06-29 14:36:46 +01:00
André Bispo	87866304a6	[PM-1208] Add device related api endpoint. Add AccoundDecryptOptions model and property to user Account.	2023-06-28 22:37:08 +01:00
André Bispo	84a82f0876	[PM-1208] Add Device approval options screen. View model waiting for additional logic to be added.	2023-05-17 17:46:45 +01:00