Bump version to 2023.2.0 (#2374)

* [SG-1057] Make check breaches true by default (#2351)

(cherry picked from commit 6875389948)

* [SG-1055] Init strength bar color (#2352)

(cherry picked from commit 3780587991)

* [SG-1052] Fix copy (#2353)

(cherry picked from commit 0bd1b3f45f)

* [SG-1056] Fix login prompt loop for added accounts (#2357)

* SG-1056 Fix login prompt loop for added accounts

* SG-1056 Fix PR comment

(cherry picked from commit f42c677d5a)

* Bumped version to 2023.2.0

---------

Co-authored-by: André Bispo <abispo@bitwarden.com>
Co-authored-by: Carlos Gonçalves <cgoncalves@bitwarden.com>
Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
Co-authored-by: Opeyemi Alao <54288773+Eeebru@users.noreply.github.com>
(cherry picked from commit bc439b45c9)

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Customer Support
-    url: https://bitwarden.com/contact/
-    about: Please contact our customer support for account issues and general customer support.
   - name: Report mobile autofill failure
     url: https://docs.google.com/forms/d/e/1FAIpQLScMopHyN7KGJs8hW562VTzbIGL4KcFnx0wJcsW0GYE1BnPiGA/viewform
     about: We are aware of some situations where the Bitwarden mobile app will not autofill information correctly. This is something the Bitwarden team is actively working on but need your help as a community and active Bitwarden users!
@@ -12,6 +9,9 @@ contact_links:
   - name: Bitwarden Community Forums
     url: https://community.bitwarden.com
     about: Please visit the community forums for general community discussion, support and the development roadmap.
+  - name: Customer Support
+    url: https://bitwarden.com/contact/
+    about: Please contact our customer support for account issues and general customer support.
   - name: Security Issues
     url: https://hackerone.com/bitwarden
     about: We use HackerOne to manage security disclosures.

.github/labeler.yml

@@ -1,19 +0,0 @@
-android:
-- src/App/*
-- src/Core/*
-- src/Android/*
-
-iOS:
-- src/App/*
-- src/Core/*
-- lib/ios/*
-- src/iOS/*
-- 'src/iOS.Autofill/*'
-- 'src/iOS.Core/*'
-- 'src/iOS.Extension/*'
-- 'src/iOS.ShareExtension/*'
-- 'src/iOS.Widget/*'
-- src/watchOS/*
-
-watchOS:
-- src/watchOS/*

.github/renovate.json

@@ -1,37 +1,22 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    ":combinePatchMinorReleases",
-    ":dependencyDashboard",
-    ":maintainLockFilesWeekly",
-    ":pinAllExceptPeerDependencies",
-    ":prConcurrentLimit10",
-    ":rebaseStalePrs",
-    "schedule:weekends",
-    ":separateMajorReleases"
-  ],
-  "enabledManagers": ["cargo", "github-actions", "npm", "nuget"],
-  "packageRules": [
-    {
-      "groupName": "cargo minor",
-      "matchManagers": ["cargo"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "gh minor",
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "npm minor",
-      "matchManagers": ["npm"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "nuget minor",
-      "matchManagers": ["nuget"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-  ]
-}
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+      "config:base",
+      "schedule:monthly",
+      ":maintainLockFilesMonthly",
+      ":preserveSemverRanges",
+      ":rebaseStalePrs",
+      ":disableDependencyDashboard"
+    ],
+    "enabledManagers": [
+      "nuget"
+    ],
+    "packageRules": [
+      {
+        "matchManagers": ["nuget"],
+        "groupName": "Nuget updates",
+        "groupSlug": "nuget",
+        "separateMajorMinor": false
+      }
+    ]
+  }

.github/resources/export-options-app-store.plist

@@ -7,13 +7,13 @@
     <key>provisioningProfiles</key>
     <dict>
         <key>com.8bit.bitwarden</key>
-        <string>Dist: Bitwarden</string>
+        <string>Dist: Bitwarden 2021</string>
         <key>com.8bit.bitwarden.autofill</key>
-        <string>Dist: Autofill</string>
+        <string>Dist: Autofill 2021</string>
         <key>com.8bit.bitwarden.find-login-action-extension</key>
-        <string>Dist: Extension</string>
+        <string>Dist: Extension 2021</string>
         <key>com.8bit.bitwarden.share-extension</key>
-        <string>Dist: Share Extension</string>
+        <string>Dist: Share Extension 2021</string>
         <key>com.8bit.bitwarden.watchkitapp</key>
         <string>Dist: Bitwarden Watch App</string>
         <key>com.8bit.bitwarden.watchkitapp.watchkitextension</key>

.github/workflows/automatic-issue-responses.yml

@@ -14,7 +14,7 @@ jobs:
       # Feature request
       - if: github.event.label.name == 'feature-request'
         name: Feature request
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
         with:
           comment: |
             We use GitHub issues as a place to track bugs and other development related issues. The [Bitwarden Community Forums](https://community.bitwarden.com/) has a [Feature Requests](https://community.bitwarden.com/c/feature-requests) section for submitting, voting for, and discussing requests like this one.
@@ -25,7 +25,7 @@ jobs:
       # Intended behavior
       - if: github.event.label.name == 'intended-behavior'
         name: Intended behaviour
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
         with:
           comment: |
             Your issue appears to be describing the intended behavior of the software. If you want this to be changed, it would be a feature request.
@@ -38,7 +38,7 @@ jobs:
       # Customer support request
       - if: github.event.label.name == 'customer-support'
         name: Customer Support request
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
         with:
           comment: |
             We use GitHub issues as a place to track bugs and other development related issues. Your issue appears to be a support request, or would otherwise be better handled by our dedicated Customer Success team.
@@ -49,14 +49,14 @@ jobs:
       # Resolved
       - if: github.event.label.name == 'resolved'
         name: Resolved
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
         with:
           comment: |
             We’ve closed this issue, as it appears the original problem has been resolved. If this happens again or continues to be an problem, please respond to this issue with any additional detail to assist with reproduction and root cause analysis.
       # Stale
       - if: github.event.label.name == 'stale'
         name: Stale
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
         with:
           comment: |
             As we haven’t heard from you about this problem in some time, this issue will now be closed.

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
 
       - name: Set up CLOC
         run: |
@@ -36,9 +36,7 @@ jobs:
       hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-        with:
-          submodules: 'true'
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
 
       - name: Check if special branches exist
         id: branch-check
@@ -67,15 +65,12 @@ jobs:
         variant: ["prod", "qa"]
     steps:
       - name: Setup NuGet
-        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
         with:
           nuget-version: 5.9.0
 
       - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1
-
-      - name: Setup Windows builder
-        run: choco install checksum --no-progress
+        uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
 
       - name: Work Around for broken Windows 2022 Runner Image
         run: |
@@ -105,7 +100,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
         with:
           fetch-depth: 0
       - name: Decrypt secrets
@@ -157,7 +152,7 @@ jobs:
         shell: pwsh
 
       - name: Report test results
-        uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226 # v1.6.0
+        uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226
         if: always()
         with:
           name: Test Results
@@ -191,7 +186,7 @@ jobs:
           $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj");
           $packageName = "com.x8bit.bitwarden";
 
-          if ("${{ matrix.variant }}" -ne "prod")
+          if ("${{ matrix.variant }}" -ne "prod") 
           {
             $packageName = "com.x8bit.bitwarden.${{ matrix.variant }}";
           }
@@ -232,7 +227,7 @@ jobs:
         shell: pwsh
       - name: Upload Prod .aab artifact
         if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: com.x8bit.bitwarden.aab
           path: ./com.x8bit.bitwarden.aab
@@ -240,7 +235,7 @@ jobs:
 
       - name: Upload Prod .apk artifact
         if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: com.x8bit.bitwarden.apk
           path: ./com.x8bit.bitwarden.apk
@@ -248,40 +243,12 @@ jobs:
 
       - name: Upload Other .apk artifact
         if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: com.x8bit.bitwarden.${{ matrix.variant }}.apk
           path: ./com.x8bit.bitwarden.${{ matrix.variant }}.apk
           if-no-files-found: error
 
-      - name: Create checksum for Prod .apk artifact
-        if: ${{ matrix.variant == 'prod' }}
-        run: |
-          checksum -f="./com.x8bit.bitwarden.apk" `
-            -t sha256 | Out-File -Encoding ASCII ./bw-android-apk-sha256.txt
-
-      - name: Create checksum for Other .apk artifact
-        if: ${{ matrix.variant != 'prod' }}
-        run: |
-          checksum -f="./com.x8bit.bitwarden.${{ matrix.variant }}.apk" `
-            -t sha256 | Out-File -Encoding ASCII ./bw-android-${{ matrix.variant }}-apk-sha256.txt
-
-      - name: Upload .apk sha file for prod
-        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
-        with:
-          name: bw-android-apk-sha256.txt
-          path: ./bw-android-apk-sha256.txt
-          if-no-files-found: error
-
-      - name: Upload .apk sha file for other
-        if: ${{ matrix.variant != 'prod' }}
-        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
-          if-no-files-found: error
-
       - name: Deploy to Play Store
         if: ${{ matrix.variant == 'prod' && (( github.ref == 'refs/heads/master'
           && needs.setup.outputs.rc_branch_exists == 0
@@ -303,15 +270,12 @@ jobs:
     runs-on: windows-2022
     steps:
       - name: Setup NuGet
-        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
         with:
           nuget-version: 5.9.0
 
       - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1
-
-      - name: Setup Windows builder
-        run: choco install checksum --no-progress
+        uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
 
       - name: Work Around for broken Windows 2022 Runner Image
         run: |
@@ -342,7 +306,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
 
       - name: Decrypt secrets
         env:
@@ -477,24 +441,12 @@ jobs:
         shell: pwsh
 
       - name: Upload F-Droid .apk artifact
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: com.x8bit.bitwarden-fdroid.apk
           path: ./com.x8bit.bitwarden-fdroid.apk
           if-no-files-found: error
 
-      - name: Create checksum for F-Droid artifact
-        run: |
-          checksum -f="./com.x8bit.bitwarden-fdroid.apk" `
-            -t sha256 | Out-File -Encoding ASCII ./bw-fdroid-apk-sha256.txt
-
-      - name: Upload F-Droid sha file
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
-        with:
-          name: bw-fdroid-apk-sha256.txt
-          path: ./bw-fdroid-apk-sha256.txt
-          if-no-files-found: error
-
 
   ios:
     name: Apple iOS
@@ -502,7 +454,7 @@ jobs:
     needs: setup
     steps:
       - name: Setup NuGet
-        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
         with:
           nuget-version: 5.9.0
 
@@ -515,19 +467,17 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-        with:
-          submodules: 'true'
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure - Prod Subscription
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
         with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
         env:
-          KEYVAULT: bitwarden-ci
+          KEYVAULT: bitwarden-prod-kv
           SECRETS: |
             appcenter-ios-token
         run: |
@@ -698,7 +648,7 @@ jobs:
         shell: bash
 
       - name: Upload App Store .ipa & dSYMs artifacts
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: Bitwarden iOS
           path: |
@@ -771,17 +721,17 @@ jobs:
       _CROWDIN_PROJECT_ID: "269690"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
         with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
         env:
-          KEYVAULT: bitwarden-ci
+          KEYVAULT: bitwarden-prod-kv
           SECRETS: |
             crowdin-api-token
         run: |
@@ -793,7 +743,7 @@ jobs:
           done
 
       - name: Upload Sources
-        uses: crowdin/github-action@ecd7eb0ef6f3cfa16293c79e9cbc4bc5b5fd9c49 # v1.4.9
+        uses: crowdin/github-action@9237b4cb361788dfce63feb2e2f15c09e2fe7415
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
@@ -839,17 +789,17 @@ jobs:
               exit 1
           fi
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure - Prod Subscription
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
         if: failure()
         with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
         if: failure()
         env:
-          KEYVAULT: bitwarden-ci
+          KEYVAULT: bitwarden-prod-kv
           SECRETS: |
             devops-alerts-slack-webhook-url
         run: |
@@ -861,7 +811,7 @@ jobs:
           done
 
       - name: Notify Slack on failure
-        uses: act10ns/slack@ed1309ab9862e57e9e583e51c7889486b9a00b0f # v2.0.0
+        uses: act10ns/slack@da3191ebe2e67f49b46880b4633f5591a96d1d33
         if: failure()
         env:
           SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}

.github/workflows/crowdin-pull.yml

@@ -15,22 +15,22 @@ jobs:
       _CROWDIN_PROJECT_ID: "269690"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af 
         with:
-          keyvault: "bitwarden-ci"
+          keyvault: "bitwarden-prod-kv"               
           secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"
 
       - name: Download translations
-        uses: crowdin/github-action@ecd7eb0ef6f3cfa16293c79e9cbc4bc5b5fd9c49 # v1.4.9
+        uses: crowdin/github-action@12143a68c213f3c6d9913c9e5023224f7231face
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
@@ -48,4 +48,4 @@ jobs:
           pull_request_title: "Autosync Crowdin Translations"
           pull_request_body: "Autosync the updated translations"
           gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
-          gpg_passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
+          gpg_passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}   

.github/workflows/enforce-labels.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Enforce Label
-        uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # v2.2.2
+        uses: yogevbd/enforce-label-action@8d1e1709b1011e6d90400a0e6cf7c0b77aa5efeb
         with:
           BANNED_LABELS: "hold,needs-qa"
           BANNED_LABELS_DESCRIPTION: "PRs with the hold or needs-qa labels cannot be merged"

.github/workflows/pr-labeler.yml

@@ -1,17 +0,0 @@
----
-name: "Pull Request Labeler"
-
-on:
-  pull_request_target: {}
-
-jobs:
-  labeler:
-    name: "Pull Request Labeler"
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/labeler@ba790c862c380240c6d5e7427be5ace9a05c754b  # v4.0.3
-        with:
-          sync-labels: true

.github/workflows/release.yml

@@ -38,11 +38,11 @@ jobs:
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/release-version-check@8f055ef543c7433c967a1b9b04a0f230923233bb
         with:
           release-type: ${{ github.event.inputs.release_type }}
           project-type: xamarin
@@ -56,7 +56,7 @@ jobs:
 
       - name: Create GitHub deployment
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: chrnorm/deployment-action@d42cde7132fcec920de534fffc3be83794335c00 # v2.0.5
+        uses: chrnorm/deployment-action@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
         id: deployment
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
@@ -64,7 +64,7 @@ jobs:
           environment: 'production'
           description: 'Deployment ${{ steps.version.outputs.version }} from branch ${{ steps.branch.outputs.branch-name }}'
           task: release
-
+      
 
       - name: Download all artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
@@ -92,9 +92,7 @@ jobs:
           artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
                       ./com.x8bit.bitwarden.apk/com.x8bit.bitwarden.apk,
                       ./com.x8bit.bitwarden-fdroid.apk/com.x8bit.bitwarden-fdroid.apk,
-                      ./Bitwarden iOS.zip,
-                      ./bw-android-apk-sha256.txt/bw-android-apk-sha256.txt,
-                      ./bw-fdroid-apk-sha256.txt/bw-fdroid-apk-sha256.txt"
+                      ./Bitwarden iOS.zip"
           commit: ${{ github.sha }}
           tag: v${{ steps.version.outputs.version }}
           name: Version ${{ steps.version.outputs.version }}
@@ -104,7 +102,7 @@ jobs:
 
       - name: Update deployment status to Success
         if: ${{ github.event.inputs.release_type != 'Dry Run' && success() }}
-        uses: chrnorm/deployment-status@2afb7d27101260f4a764219439564d954d10b5b0 # v2.0.1
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'success'
@@ -112,7 +110,7 @@ jobs:
 
       - name: Update deployment status to Failure
         if: ${{ github.event.inputs.release_type != 'Dry Run' && failure() }}
-        uses: chrnorm/deployment-status@2afb7d27101260f4a764219439564d954d10b5b0 # v2.0.1
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'failure'
@@ -126,7 +124,7 @@ jobs:
     if: inputs.fdroid_publish
     steps:
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
 
       - name: Download F-Droid .apk artifact
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}

.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@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
 
       - name: Calculate bumped version
         id: version
@@ -32,14 +32,32 @@ jobs:
           echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT
 
   trigger_version_bump:
-    name: "Version bump"
+    name: "Trigger version bump workflow"
     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 }}
+      - name: Login to Azure
+        uses: Azure/login@ec3c14589bd3e9312b3cc8c41e6860e258df9010
         with:
-          version_number: ${{ needs.setup.outputs.version_number }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
+
+      - name: Retrieve secrets
+        id: retrieve-secrets
+        uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af
+        with:
+          keyvault: "bitwarden-prod-kv"
+          secrets: "github-pat-bitwarden-devops-bot-repo-scope"
+
+      - name: Call GitHub API to trigger workflow bump
+        env:
+          TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
+          VERSION: ${{ needs.setup.outputs.version_number}}
+        run: |
+          JSON_STRING=$(printf '{"ref":"master", "inputs": { "version_number":"%s"}}' "$VERSION")
+          curl \
+            -X POST \
+            -i -u bitwarden-devops-bot:$TOKEN \
+            -H "Accept: application/vnd.github.v3+json" \
+            https://api.github.com/repos/bitwarden/mobile/actions/workflows/version-bump.yml/dispatches \
+            -d $JSON_STRING

.github/workflows/version-bump.yml

@@ -7,14 +7,6 @@ on:
       version_number:
         description: "New Version"
         required: true
-  workflow_call:
-    inputs:
-      version_number:
-        required: true
-        type: string
-    secrets:
-      AZURE_PROD_KV_CREDENTIALS:
-        required: true
 
 jobs:
   bump_version:
@@ -22,22 +14,22 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Branch
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure - Prod Subscription
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
         with:
-         creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+         creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af
         with:
-          keyvault: "bitwarden-ci"
+          keyvault: "bitwarden-prod-kv"
           secrets: "github-gpg-private-key, github-gpg-private-key-passphrase"
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 # v5.2.0
+        uses: crazy-max/ghaction-import-gpg@c8bb57c57e8df1be8c73ff3d59deab1dbc00e0d1
         with:
           gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
           passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
@@ -48,31 +40,31 @@ jobs:
         run: git switch -c version_bump_${{ github.event.inputs.version_number }}
 
       - name: Bump Version - Android XML
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
         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@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
         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@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
         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@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
         with:
           version: ${{ github.event.inputs.version_number }}
           file_path: "./src/iOS.ShareExtension/Info.plist"
 
       - name: Bump Version - iOS
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
         with:
           version: ${{ github.event.inputs.version_number }}
           file_path: "./src/iOS/Info.plist"

.github/workflows/workflow-linter.yml

@@ -8,4 +8,4 @@ on:
 
 jobs:
   call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@34ecb67b2a357795dc893549df0795e7383ff50f
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "lib/MessagePack"]
-	path = lib/MessagePack
-	url = https://github.com/bitwarden/MessagePack.git

README.md

@@ -23,3 +23,15 @@ Interested in contributing in a big way? Consider joining our team! We're hiring
 Code contributions are welcome! Please commit any pull requests against the `master` branch. Learn more about how to contribute by reading the [Contributing Guidelines](https://contributing.bitwarden.com/contributing/). Check out the [Contributing Documentation](https://contributing.bitwarden.com/) for how to get started with your first contribution.
 
 Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.
+
+### Dotnet-format
+
+We recently migrated to using dotnet-format as code formatter. All previous branches will need to updated to avoid large merge conflicts using the following steps:
+
+1. Check out your local Branch
+2. Run `git merge e0efcfbe45b2a27c73e9593bfd7a71fad2aa7a35`
+3. Resolve any merge conflicts, commit.
+4. Run `dotnet tool run dotnet-format`
+5. Commit
+6. Run `git merge -Xours 04539af2a66668b6e85476d5cf318c9150ec4357`
+7. Push

appIcons/Android/beta-layered-excluded.svg

@@ -1,11 +0,0 @@
-<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_41_29)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M70.214 34C70.7096 34 71.1457 34.1883 71.5124 34.555C71.8791 34.9217 72.0674 35.3479 72.0971 35.8534V50.4336H71.0669V51.9453H72.0971V58.0938C72.0971 59.749 71.7701 61.3942 71.1258 63.0295C70.4816 64.6549 69.6788 66.1019 68.7274 67.3706C67.766 68.6293 66.6262 69.8582 65.308 71.0575C63.98 72.2567 62.7609 73.2478 61.6409 74.0407C60.521 74.8237 59.3515 75.5769 58.1324 76.2806C56.9134 76.9843 56.0511 77.4699 55.5357 77.7177C55.0303 77.9655 54.614 78.1538 54.3068 78.2926C54.0788 78.4115 53.8211 78.471 53.5535 78.471C53.2859 78.471 53.0282 78.4115 52.8003 78.2926C52.5297 78.1791 52.1822 78.0118 51.7511 77.8042C51.6927 77.7761 51.6328 77.7473 51.5713 77.7177C51.0559 77.46 50.1937 76.9843 48.9746 76.2806C47.7555 75.5769 46.586 74.8336 45.4661 74.0407C44.3461 73.2478 43.1172 72.2567 41.799 71.0575C40.4709 69.8682 39.3311 68.6392 38.3797 67.3706C37.4183 66.1119 36.6155 64.6648 35.9713 63.0295C35.3271 61.4041 35 59.749 35 58.0938V35.8534C35 35.3479 35.1883 34.9217 35.555 34.555C35.9217 34.1883 36.3479 34 36.8534 34H70.214ZM67.211 57.5H70.1118V59H67.177C66.4282 66.7468 53.5337 73.2875 53.5337 73.2875V38.7573H67.211V50.4336H70.1118V51.9219H67.211V53.8027H69.895V55.291H67.211V57.5Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M58 46C56.3431 46 55 47.3431 55 49V60C55 61.6569 56.3431 63 58 63H107C108.657 63 110 61.6569 110 60V49C110 47.3431 108.657 46 107 46H58ZM59.7817 50.4336H57.1157V59H60.3208C60.9692 59 61.5278 58.9023 61.9966 58.707C62.4692 58.5078 62.8325 58.2227 63.0864 57.8516C63.3403 57.4805 63.4673 57.0352 63.4673 56.5156C63.4673 56.0664 63.397 55.707 63.2563 55.4375C63.1196 55.1641 62.936 54.957 62.7056 54.8164C62.4751 54.6719 62.2173 54.5703 61.9321 54.5117V54.4531C62.2134 54.4023 62.4517 54.293 62.647 54.125C62.8423 53.957 62.9907 53.7422 63.0923 53.4805C63.1978 53.2188 63.2505 52.9258 63.2505 52.6016C63.2505 51.7969 62.9575 51.2344 62.3716 50.9141C61.7856 50.5938 60.9224 50.4336 59.7817 50.4336ZM59.9868 53.8262H58.9321V51.9219H59.8872C60.4067 51.9219 60.7856 51.9941 61.0239 52.1387C61.2661 52.2793 61.3872 52.5137 61.3872 52.8418C61.3872 53.166 61.2856 53.4121 61.0825 53.5801C60.8794 53.7441 60.5142 53.8262 59.9868 53.8262ZM58.9321 57.5V55.2676H60.0571C60.4438 55.2676 60.7466 55.3125 60.9653 55.4023C61.188 55.4922 61.3462 55.6172 61.4399 55.7773C61.5337 55.9375 61.5806 56.123 61.5806 56.334C61.5806 56.6895 61.4731 56.9727 61.2583 57.1836C61.0435 57.3945 60.6626 57.5 60.1157 57.5H58.9321ZM65.1782 59H70.1118V57.5H66.9946V55.291H69.895V53.8027H66.9946V51.9219H70.1118V50.4336H65.1782V59ZM73.3931 59H75.2095V51.9453H77.5356V50.4336H71.0669V51.9453H73.3931V59ZM83.4771 56.9609L84.0981 59H86.0552L83.02 50.3984H80.7993L77.7759 59H79.7329L80.354 56.9609H83.4771ZM82.4224 53.4453L83.0435 55.4375H80.811L81.4263 53.4453C81.4536 53.3555 81.4985 53.2051 81.561 52.9941C81.6235 52.7832 81.688 52.5605 81.7544 52.3262C81.8247 52.0879 81.8794 51.8887 81.9185 51.7285C81.9575 51.8887 82.0083 52.0781 82.0708 52.2969C82.1372 52.5117 82.2017 52.7246 82.2642 52.9355C82.3306 53.1426 82.3833 53.3125 82.4224 53.4453Z" fill="#6795E8"/>
-</g>
-<defs>
-<clipPath id="clip0_41_29">
-<rect width="108" height="108" fill="white"/>
-</clipPath>
-</defs>
-</svg>

appIcons/Android/beta-layered.svg

@@ -1,17 +0,0 @@
-<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_36_10)">
-<path d="M71.5717 34.6343L113 76.0625L89.709 119.077L40.6492 70.0168L53.5336 77.4501L70.8779 60.1057L71.5717 34.6343Z" fill="url(#paint0_linear_36_10)"/>
-<path d="M71.5124 34.555C71.1457 34.1883 70.7096 34 70.214 34H36.8534C36.3479 34 35.9217 34.1883 35.555 34.555C35.1883 34.9217 35 35.3479 35 35.8534V58.0938C35 59.749 35.3271 61.4041 35.9713 63.0295C36.6155 64.6648 37.4183 66.1119 38.3797 67.3706C39.3311 68.6392 40.4709 69.8682 41.799 71.0575C43.1172 72.2567 44.3461 73.2478 45.4661 74.0407C46.586 74.8336 47.7555 75.5769 48.9746 76.2806C50.1937 76.9843 51.0559 77.46 51.5713 77.7177C52.0867 77.9655 52.493 78.1637 52.8003 78.2926C53.0282 78.4115 53.2859 78.471 53.5535 78.471C53.8211 78.471 54.0788 78.4115 54.3068 78.2926C54.614 78.1538 55.0303 77.9655 55.5357 77.7177C56.0511 77.4699 56.9134 76.9843 58.1324 76.2806C59.3515 75.5769 60.521 74.8237 61.6409 74.0407C62.7609 73.2478 63.98 72.2567 65.308 71.0575C66.6262 69.8582 67.766 68.6293 68.7274 67.3706C69.6788 66.1019 70.4816 64.6549 71.1258 63.0295C71.7701 61.3942 72.0971 59.749 72.0971 58.0938V35.8534C72.0674 35.3479 71.8791 34.9217 71.5124 34.555ZM67.211 58.3019C67.211 66.3497 53.5337 73.2875 53.5337 73.2875V38.7573H67.211C67.211 38.7573 67.211 50.2542 67.211 58.3019Z" fill="white"/>
-<path d="M55 49C55 47.3431 56.3431 46 58 46H107C108.657 46 110 47.3431 110 49V60C110 61.6569 108.657 63 107 63H58C56.3431 63 55 61.6569 55 60V49Z" fill="#6795E8"/>
-<path d="M57.116 50.4336H59.782C60.9226 50.4336 61.7859 50.5938 62.3718 50.9141C62.9578 51.2344 63.2507 51.7969 63.2507 52.6016C63.2507 52.9258 63.198 53.2188 63.0925 53.4805C62.991 53.7422 62.8425 53.957 62.6472 54.125C62.4519 54.293 62.2136 54.4023 61.9324 54.4531V54.5117C62.2175 54.5703 62.4753 54.6719 62.7058 54.8164C62.9363 54.957 63.1199 55.1641 63.2566 55.4375C63.3972 55.707 63.4675 56.0664 63.4675 56.5156C63.4675 57.0352 63.3406 57.4805 63.0867 57.8516C62.8328 58.2227 62.4695 58.5078 61.9968 58.707C61.5281 58.9023 60.9695 59 60.321 59H57.116V50.4336ZM58.9324 53.8262H59.9871C60.5144 53.8262 60.8796 53.7441 61.0828 53.5801C61.2859 53.4121 61.3875 53.166 61.3875 52.8418C61.3875 52.5137 61.2664 52.2793 61.0242 52.1387C60.7859 51.9941 60.407 51.9219 59.8875 51.9219H58.9324V53.8262ZM58.9324 55.2676V57.5H60.116C60.6628 57.5 61.0437 57.3945 61.2585 57.1836C61.4734 56.9727 61.5808 56.6895 61.5808 56.334C61.5808 56.123 61.5339 55.9375 61.4402 55.7773C61.3464 55.6172 61.1882 55.4922 60.9656 55.4023C60.7468 55.3125 60.4441 55.2676 60.0574 55.2676H58.9324ZM70.1121 59H65.1785V50.4336H70.1121V51.9219H66.9949V53.8027H69.8953V55.291H66.9949V57.5H70.1121V59ZM75.2097 59H73.3933V51.9453H71.0671V50.4336H77.5359V51.9453H75.2097V59ZM84.0984 59L83.4773 56.9609H80.3542L79.7332 59H77.7761L80.7996 50.3984H83.0203L86.0554 59H84.0984ZM83.0437 55.4375L82.4226 53.4453C82.3835 53.3125 82.3308 53.1426 82.2644 52.9355C82.2019 52.7246 82.1375 52.5117 82.071 52.2969C82.0085 52.0781 81.9578 51.8887 81.9187 51.7285C81.8796 51.8887 81.825 52.0879 81.7546 52.3262C81.6882 52.5605 81.6238 52.7832 81.5613 52.9941C81.4988 53.2051 81.4539 53.3555 81.4265 53.4453L80.8113 55.4375H83.0437Z" fill="#212529"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_36_10" x1="37.8512" y1="38.8122" x2="89.011" y2="89.972" gradientUnits="userSpaceOnUse">
-<stop stop-opacity="0.247059"/>
-<stop offset="1" stop-opacity="0"/>
-</linearGradient>
-<clipPath id="clip0_36_10">
-<rect width="108" height="108" fill="white"/>
-</clipPath>
-</defs>
-</svg>

appIcons/Android/dev-layered-excluded.svg

@@ -1,11 +0,0 @@
-<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_41_21)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M70.214 34C70.7096 34 71.1457 34.1883 71.5124 34.555C71.8791 34.9217 72.0674 35.3479 72.0971 35.8534V50.4336H71.647L72.0971 51.7604V58.0938C72.0971 59.749 71.7701 61.3942 71.1258 63.0295C70.4816 64.6549 69.6788 66.1019 68.7274 67.3706C67.766 68.6293 66.6262 69.8582 65.308 71.0575C63.98 72.2567 62.7609 73.2478 61.6409 74.0407C60.521 74.8237 59.3515 75.5769 58.1324 76.2806C56.9134 76.9843 56.0511 77.4699 55.5357 77.7177C55.0303 77.9655 54.614 78.1538 54.3068 78.2926C54.0788 78.4115 53.8211 78.471 53.5535 78.471C53.2859 78.471 53.0282 78.4115 52.8003 78.2926C52.5297 78.1791 52.1822 78.0118 51.7511 77.8042C51.6927 77.7761 51.6328 77.7473 51.5713 77.7177C51.0559 77.46 50.1937 76.9843 48.9746 76.2806C47.7555 75.5769 46.586 74.8336 45.4661 74.0407C44.3461 73.2478 43.1172 72.2567 41.799 71.0575C40.4709 69.8682 39.3311 68.6392 38.3797 67.3706C37.4183 66.1119 36.6155 64.6648 35.9713 63.0295C35.3271 61.4041 35 59.749 35 58.0938V35.8534C35 35.3479 35.1883 34.9217 35.555 34.555C35.9217 34.1883 36.3479 34 36.8534 34H70.214ZM67.177 59C66.4282 66.7468 53.5337 73.2875 53.5337 73.2875V38.7573H67.211V50.4336H70.9321V51.9219H67.8149V53.8027H70.7153V55.291H67.8149V57.5H70.9321V59H67.177Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M58 46C56.3431 46 55 47.3431 55 49V60C55 61.6569 56.3431 63 58 63H107C108.657 63 110 61.6569 110 60V49C110 47.3431 108.657 46 107 46H58ZM63.6665 57.0547C64.0376 56.4062 64.2231 55.5996 64.2231 54.6348C64.2231 53.7168 64.0415 52.9473 63.6782 52.3262C63.3149 51.7012 62.8032 51.2305 62.1431 50.9141C61.4829 50.5938 60.7036 50.4336 59.8052 50.4336H57.1157V59H59.5415C60.5259 59 61.3677 58.8379 62.0669 58.5137C62.7661 58.1855 63.2993 57.6992 63.6665 57.0547ZM62.0552 53.123C62.2427 53.5293 62.3364 54.0488 62.3364 54.6816C62.3364 55.6152 62.1196 56.3184 61.686 56.791C61.2563 57.2637 60.5981 57.5 59.7114 57.5H58.9321V51.9219H59.8989C60.4302 51.9219 60.8755 52.0195 61.2349 52.2148C61.5981 52.4102 61.8716 52.7129 62.0552 53.123ZM65.9985 59H70.9321V57.5H67.8149V55.291H70.7153V53.8027H67.8149V51.9219H70.9321V50.4336H65.9985V59ZM76.5337 59L79.4458 50.4336H77.6118L75.9888 55.5312C75.9614 55.6211 75.9165 55.7852 75.854 56.0234C75.7954 56.2578 75.7349 56.5059 75.6724 56.7676C75.6138 57.0293 75.5728 57.2461 75.5493 57.418C75.5259 57.2461 75.481 57.0293 75.4146 56.7676C75.3521 56.502 75.2896 56.252 75.2271 56.0176C75.1646 55.7793 75.1196 55.6172 75.0923 55.5312L73.481 50.4336H71.647L74.5532 59H76.5337Z" fill="#2DA49D"/>
-</g>
-<defs>
-<clipPath id="clip0_41_21">
-<rect width="108" height="108" fill="white"/>
-</clipPath>
-</defs>
-</svg>

appIcons/Android/dev-layered.svg

@@ -1,17 +0,0 @@
-<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_36_2)">
-<path d="M71.5717 34.6343L113 76.0625L89.709 119.077L40.6492 70.0168L53.5336 77.4501L70.8779 60.1057L71.5717 34.6343Z" fill="url(#paint0_linear_36_2)"/>
-<path d="M71.5124 34.555C71.1457 34.1883 70.7096 34 70.214 34H36.8534C36.3479 34 35.9217 34.1883 35.555 34.555C35.1883 34.9217 35 35.3479 35 35.8534V58.0938C35 59.749 35.3271 61.4041 35.9713 63.0295C36.6155 64.6648 37.4183 66.1119 38.3797 67.3706C39.3311 68.6392 40.4709 69.8682 41.799 71.0575C43.1172 72.2567 44.3461 73.2478 45.4661 74.0407C46.586 74.8336 47.7555 75.5769 48.9746 76.2806C50.1937 76.9843 51.0559 77.46 51.5713 77.7177C52.0867 77.9655 52.493 78.1637 52.8003 78.2926C53.0282 78.4115 53.2859 78.471 53.5535 78.471C53.8211 78.471 54.0788 78.4115 54.3068 78.2926C54.614 78.1538 55.0303 77.9655 55.5357 77.7177C56.0511 77.4699 56.9134 76.9843 58.1324 76.2806C59.3515 75.5769 60.521 74.8237 61.6409 74.0407C62.7609 73.2478 63.98 72.2567 65.308 71.0575C66.6262 69.8582 67.766 68.6293 68.7274 67.3706C69.6788 66.1019 70.4816 64.6549 71.1258 63.0295C71.7701 61.3942 72.0971 59.749 72.0971 58.0938V35.8534C72.0674 35.3479 71.8791 34.9217 71.5124 34.555ZM67.211 58.3019C67.211 66.3497 53.5337 73.2875 53.5337 73.2875V38.7573H67.211C67.211 38.7573 67.211 50.2542 67.211 58.3019Z" fill="white"/>
-<path d="M55 49C55 47.3431 56.3431 46 58 46H107C108.657 46 110 47.3431 110 49V60C110 61.6569 108.657 63 107 63H58C56.3431 63 55 61.6569 55 60V49Z" fill="#2DA49D"/>
-<path d="M64.2234 54.6348C64.2234 55.5996 64.0378 56.4062 63.6667 57.0547C63.2996 57.6992 62.7664 58.1855 62.0671 58.5137C61.3679 58.8379 60.5261 59 59.5417 59H57.116V50.4336H59.8054C60.7039 50.4336 61.4832 50.5938 62.1433 50.9141C62.8035 51.2305 63.3152 51.7012 63.6785 52.3262C64.0417 52.9473 64.2234 53.7168 64.2234 54.6348ZM62.3367 54.6816C62.3367 54.0488 62.2429 53.5293 62.0554 53.123C61.8718 52.7129 61.5984 52.4102 61.2351 52.2148C60.8757 52.0195 60.4304 51.9219 59.8992 51.9219H58.9324V57.5H59.7117C60.5984 57.5 61.2566 57.2637 61.6863 56.791C62.1199 56.3184 62.3367 55.6152 62.3367 54.6816ZM70.9324 59H65.9988V50.4336H70.9324V51.9219H67.8152V53.8027H70.7156V55.291H67.8152V57.5H70.9324V59ZM79.446 50.4336L76.5339 59H74.5535L71.6472 50.4336H73.4812L75.0925 55.5312C75.1199 55.6172 75.1648 55.7793 75.2273 56.0176C75.2898 56.252 75.3523 56.502 75.4148 56.7676C75.4812 57.0293 75.5261 57.2461 75.5496 57.418C75.573 57.2461 75.614 57.0293 75.6726 56.7676C75.7351 56.5059 75.7957 56.2578 75.8542 56.0234C75.9167 55.7852 75.9617 55.6211 75.989 55.5312L77.6121 50.4336H79.446Z" fill="#212529"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_36_2" x1="37.8512" y1="38.8122" x2="89.011" y2="89.972" gradientUnits="userSpaceOnUse">
-<stop stop-opacity="0.247059"/>
-<stop offset="1" stop-opacity="0"/>
-</linearGradient>
-<clipPath id="clip0_36_2">
-<rect width="108" height="108" fill="white"/>
-</clipPath>
-</defs>
-</svg>

appIcons/Android/qa-layered-excluded.svg

@@ -1,11 +0,0 @@
-<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_41_13)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M70.214 34C70.7096 34 71.1457 34.1883 71.5124 34.555C71.8791 34.9217 72.0674 35.3479 72.0971 35.8534V52.9823L70.8325 49.3984H68.6118L67.211 53.3838V38.7573H53.5337V73.2875C53.5337 73.2875 67.211 66.3497 67.211 58.3019V58H67.5454L68.1665 55.9609H71.2896L71.9106 58H72.0971V58.0938C72.0971 59.749 71.7701 61.3942 71.1258 63.0295C70.4816 64.6549 69.6788 66.1019 68.7274 67.3706C67.766 68.6293 66.6262 69.8582 65.308 71.0575C63.98 72.2567 62.7609 73.2478 61.6409 74.0407C60.521 74.8237 59.3515 75.5769 58.1324 76.2806C56.9134 76.9843 56.0511 77.4699 55.5357 77.7177C55.0303 77.9655 54.614 78.1538 54.3068 78.2926C54.0788 78.4115 53.8211 78.471 53.5535 78.471C53.2859 78.471 53.0282 78.4115 52.8003 78.2926C52.5297 78.1791 52.1822 78.0118 51.7511 77.8042C51.6927 77.7761 51.6328 77.7473 51.5713 77.7177C51.0559 77.46 50.1937 76.9843 48.9746 76.2806C47.7555 75.5769 46.586 74.8336 45.4661 74.0407C44.3461 73.2478 43.1172 72.2567 41.799 71.0575C40.4709 69.8682 39.3311 68.6392 38.3797 67.3706C37.4183 66.1119 36.6155 64.6648 35.9713 63.0295C35.3271 61.4041 35 59.749 35 58.0938V35.8534C35 35.3479 35.1883 34.9217 35.555 34.555C35.9217 34.1883 36.3479 34 36.8534 34H70.214ZM70.2349 52.4453L70.856 54.4375H68.6235L69.2388 52.4453C69.2661 52.3555 69.311 52.2051 69.3735 51.9941C69.436 51.7832 69.5005 51.5605 69.5669 51.3262C69.6372 51.0879 69.6919 50.8887 69.731 50.7285C69.77 50.8887 69.8208 51.0781 69.8833 51.2969C69.9497 51.5117 70.0142 51.7246 70.0767 51.9355C70.1431 52.1426 70.1958 52.3125 70.2349 52.4453Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M58 46C56.3431 46 55 47.3431 55 49V60C55 61.6569 56.3431 63 58 63H107C108.657 63 110 61.6569 110 60V49C110 47.3431 108.657 46 107 46H58ZM64.6626 55.457C64.8149 54.9258 64.8911 54.3418 64.8911 53.7051C64.8911 52.8145 64.7446 52.0391 64.4517 51.3789C64.1626 50.7188 63.7173 50.207 63.1157 49.8438C62.5181 49.4805 61.7544 49.2988 60.8247 49.2988C59.8911 49.2988 59.1216 49.4805 58.5161 49.8438C57.9106 50.207 57.4614 50.7188 57.1685 51.3789C56.8794 52.0352 56.7349 52.8066 56.7349 53.6934C56.7349 54.3574 56.8169 54.9609 56.981 55.5039C57.145 56.0469 57.3931 56.5137 57.7251 56.9043C58.061 57.2949 58.4849 57.5957 58.9966 57.8066C59.5083 58.0137 60.1138 58.1172 60.813 58.1172H60.8774H60.9478L62.5181 60.0391H64.8442L62.7817 57.7363C63.2622 57.5176 63.6587 57.2148 63.9712 56.8281C64.2837 56.4414 64.5142 55.9844 64.6626 55.457ZM58.8618 55.252C58.7134 54.8184 58.6392 54.3027 58.6392 53.7051C58.6392 53.1035 58.7134 52.5879 58.8618 52.1582C59.0142 51.7246 59.2505 51.3926 59.5708 51.1621C59.895 50.9277 60.313 50.8105 60.8247 50.8105C61.5942 50.8105 62.147 51.0684 62.4829 51.584C62.8188 52.0996 62.9868 52.8066 62.9868 53.7051C62.9868 54.3027 62.9126 54.8184 62.7642 55.252C62.6196 55.6816 62.3872 56.0137 62.0669 56.248C61.7466 56.4785 61.3286 56.5938 60.813 56.5938C60.3052 56.5938 59.8911 56.4785 59.5708 56.248C59.2505 56.0137 59.0142 55.6816 58.8618 55.252ZM71.2896 55.9609L71.9106 58H73.8677L70.8325 49.3984H68.6118L65.5884 58H67.5454L68.1665 55.9609H71.2896ZM70.2349 52.4453L70.856 54.4375H68.6235L69.2388 52.4453C69.2661 52.3555 69.311 52.2051 69.3735 51.9941C69.436 51.7832 69.5005 51.5605 69.5669 51.3262C69.6372 51.0879 69.6919 50.8887 69.731 50.7285C69.77 50.8887 69.8208 51.0781 69.8833 51.2969C69.9497 51.5117 70.0142 51.7246 70.0767 51.9355C70.1431 52.1426 70.1958 52.3125 70.2349 52.4453Z" fill="#C32998"/>
-</g>
-<defs>
-<clipPath id="clip0_41_13">
-<rect width="108" height="108" rx="34" fill="white"/>
-</clipPath>
-</defs>
-</svg>

appIcons/Android/qa-layered.svg

@@ -1,17 +0,0 @@
-<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_34_2)">
-<path d="M71.5717 34.6343L113 76.0625L89.709 119.077L40.6492 70.0168L53.5336 77.4501L70.8779 60.1057L71.5717 34.6343Z" fill="url(#paint0_linear_34_2)"/>
-<path d="M71.5124 34.555C71.1457 34.1883 70.7096 34 70.214 34H36.8534C36.3479 34 35.9217 34.1883 35.555 34.555C35.1883 34.9217 35 35.3479 35 35.8534V58.0938C35 59.749 35.3271 61.4041 35.9713 63.0295C36.6155 64.6648 37.4183 66.1119 38.3797 67.3706C39.3311 68.6392 40.4709 69.8682 41.799 71.0575C43.1172 72.2567 44.3461 73.2478 45.4661 74.0407C46.586 74.8336 47.7555 75.5769 48.9746 76.2806C50.1937 76.9843 51.0559 77.46 51.5713 77.7177C52.0867 77.9655 52.493 78.1637 52.8003 78.2926C53.0282 78.4115 53.2859 78.471 53.5535 78.471C53.8211 78.471 54.0788 78.4115 54.3068 78.2926C54.614 78.1538 55.0303 77.9655 55.5357 77.7177C56.0511 77.4699 56.9134 76.9843 58.1324 76.2806C59.3515 75.5769 60.521 74.8237 61.6409 74.0407C62.7609 73.2478 63.98 72.2567 65.308 71.0575C66.6262 69.8582 67.766 68.6293 68.7274 67.3706C69.6788 66.1019 70.4816 64.6549 71.1258 63.0295C71.7701 61.3942 72.0971 59.749 72.0971 58.0938V35.8534C72.0674 35.3479 71.8791 34.9217 71.5124 34.555ZM67.211 58.3019C67.211 66.3497 53.5337 73.2875 53.5337 73.2875V38.7573H67.211C67.211 38.7573 67.211 50.2542 67.211 58.3019Z" fill="white"/>
-<path d="M55 49C55 47.3431 56.3431 46 58 46H107C108.657 46 110 47.3431 110 49V60C110 61.6569 108.657 63 107 63H58C56.3431 63 55 61.6569 55 60V49Z" fill="#C32998"/>
-<path d="M64.8914 53.7051C64.8914 54.3418 64.8152 54.9258 64.6628 55.457C64.5144 55.9844 64.2839 56.4414 63.9714 56.8281C63.6589 57.2148 63.2625 57.5176 62.782 57.7363L64.8445 60.0391H62.5183L60.948 58.1172C60.9207 58.1172 60.8972 58.1172 60.8777 58.1172C60.8582 58.1172 60.8367 58.1172 60.8132 58.1172C60.114 58.1172 59.5085 58.0137 58.9968 57.8066C58.4851 57.5957 58.0613 57.2949 57.7253 56.9043C57.3933 56.5137 57.1453 56.0469 56.9812 55.5039C56.8171 54.9609 56.7351 54.3574 56.7351 53.6934C56.7351 52.8066 56.8796 52.0352 57.1687 51.3789C57.4617 50.7188 57.9109 50.207 58.5164 49.8438C59.1218 49.4805 59.8914 49.2988 60.825 49.2988C61.7546 49.2988 62.5183 49.4805 63.116 49.8438C63.7175 50.207 64.1628 50.7188 64.4519 51.3789C64.7449 52.0391 64.8914 52.8145 64.8914 53.7051ZM58.6394 53.7051C58.6394 54.3027 58.7136 54.8184 58.8621 55.252C59.0144 55.6816 59.2507 56.0137 59.571 56.248C59.8914 56.4785 60.3054 56.5938 60.8132 56.5938C61.3289 56.5938 61.7468 56.4785 62.0671 56.248C62.3875 56.0137 62.6199 55.6816 62.7644 55.252C62.9128 54.8184 62.9871 54.3027 62.9871 53.7051C62.9871 52.8066 62.8191 52.0996 62.4832 51.584C62.1472 51.0684 61.5945 50.8105 60.825 50.8105C60.3132 50.8105 59.8953 50.9277 59.571 51.1621C59.2507 51.3926 59.0144 51.7246 58.8621 52.1582C58.7136 52.5879 58.6394 53.1035 58.6394 53.7051ZM71.9109 58L71.2898 55.9609H68.1667L67.5457 58H65.5886L68.6121 49.3984H70.8328L73.8679 58H71.9109ZM70.8562 54.4375L70.2351 52.4453C70.196 52.3125 70.1433 52.1426 70.0769 51.9355C70.0144 51.7246 69.95 51.5117 69.8835 51.2969C69.821 51.0781 69.7703 50.8887 69.7312 50.7285C69.6921 50.8887 69.6375 51.0879 69.5671 51.3262C69.5007 51.5605 69.4363 51.7832 69.3738 51.9941C69.3113 52.2051 69.2664 52.3555 69.239 52.4453L68.6238 54.4375H70.8562Z" fill="white"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_34_2" x1="37.8512" y1="38.8122" x2="89.011" y2="89.972" gradientUnits="userSpaceOnUse">
-<stop stop-opacity="0.247059"/>
-<stop offset="1" stop-opacity="0"/>
-</linearGradient>
-<clipPath id="clip0_34_2">
-<rect width="108" height="108" fill="white"/>
-</clipPath>
-</defs>
-</svg>

appIcons/icongen.sh

@@ -1,136 +0,0 @@
-#! /bin/sh
-
-function print_example() {
-    echo "Example"
-    echo "  icons ios ~/AppIcon.pdf ~/Icons/"
-}
-    
-function print_usage() {
-    echo "Usage"
-    echo "  icons <ios|watch|complication|macos> in-file.pdf (out-dir)"
-}
-
-function command_exists() {
-    if type "$1" >/dev/null 2>&1; then
-        return 1
-    else
-        return 0
-    fi
-}
-
-if command_exists "sips" == 0 ; then
-    echo "sips tool not found"
-    exit 1
-fi
-
-if [ "$1" = "--help" ] || [ "$1" = "-h" ] ; then
-    print_usage
-    exit 0
-fi
-
-PLATFORM="$1"
-FILE="$2"
-if [ -z "$PLATFORM" ] || [ -z "$FILE" ] ; then
-    echo "Error: missing arguments"
-    echo ""
-    print_usage
-    echo ""
-    print_example
-    exit 1
-fi
-
-DIR="$3"
-if [ -z "$DIR" ] ; then
-    DIR=$(dirname $FILE)
-fi
-
-# Create directory if needed
-mkdir -p "$DIR"
-
-if [[ "$PLATFORM" == *"ios"* ]] ; then # iOS
-    sips -s format png -Z '180'  "${FILE}" --out "${DIR}"/Icon-180.png
-    sips -s format png -Z '29'   "${FILE}" --out "${DIR}"/Icon-29.png
-    sips -s format png -Z '58'   "${FILE}" --out "${DIR}"/Icon-58.png
-    sips -s format png -Z '120'  "${FILE}" --out "${DIR}"/Icon-120.png
-    sips -s format png -Z '87'   "${FILE}" --out "${DIR}"/Icon-87.png
-    sips -s format png -Z '40'   "${FILE}" --out "${DIR}"/Icon-40.png
-    sips -s format png -Z '80'   "${FILE}" --out "${DIR}"/Icon-80.png
-    sips -s format png -Z '76'   "${FILE}" --out "${DIR}"/Icon-76.png
-    sips -s format png -Z '152'  "${FILE}" --out "${DIR}"/Icon-152.png
-    sips -s format png -Z '167'  "${FILE}" --out "${DIR}"/Icon-167.png
-    sips -s format png -Z '60'   "${FILE}" --out "${DIR}"/Icon-60.png
-    sips -s format png -Z '20'   "${FILE}" --out "${DIR}"/Icon-20.png
-    sips -s format png -Z '1024' "${FILE}" --out "${DIR}"/Icon-1024.png
-    
-    # https://developer.apple.com/library/archive/documentation/Xcode/Reference/xcode_ref-Asset_Catalog_Format/AppIconType.html
-    contents_json='{"images":[{"size":"20x20","idiom":"iphone","filename":"iPhoneNotification@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"iPhoneNotification@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"iPhoneSettings@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"iPhoneSettings@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"iPhoneSpotlight@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"iPhoneSpotlight@3x.png","scale":"3x"},{"size":"60x60","idiom":"iphone","filename":"iPhone@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"iPhone@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"iPadNotification.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"iPadNotification@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"iPadSettings.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"iPadSettings@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"iPadSpotlight.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"iPadSpotlight@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"iPad.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"iPad@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"iPadPro@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"AppStoreMarketing.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}'
-    echo $contents_json > "${DIR}"/Contents.json
-fi
-
-if [[ "$PLATFORM" == *"watch"* ]] ; then # Apple Watch
-    sips -s format png -Z '48'  "${FILE}" --out "${DIR}"/Watch38mmNotificationCenter.png
-    sips -s format png -Z '55'  "${FILE}" --out "${DIR}"/Watch42mmNotificationCenter.png
-    sips -s format png -Z '66'  "${FILE}" --out "${DIR}"/Watch66NotificationCenter.png
-    sips -s format png -Z '58'  "${FILE}" --out "${DIR}"/WatchCompanionSettings@2x.png
-    sips -s format png -Z '87'  "${FILE}" --out "${DIR}"/WatchCompanionSettings@3x.png
-    sips -s format png -Z '80'  "${FILE}" --out "${DIR}"/Watch38MM42MMHomeScreen.png
-    sips -s format png -Z '88'  "${FILE}" --out "${DIR}"/Watch40MMHomeScreen.png
-    sips -s format png -Z '92' "${FILE}" --out "${DIR}"/Watch41MMHomeScreen.png
-    sips -s format png -Z '100' "${FILE}" --out "${DIR}"/Watch44MMHomeScreen.png
-    sips -s format png -Z '102' "${FILE}" --out "${DIR}"/Watch45MMHomeScreen.png
-    sips -s format png -Z '108' "${FILE}" --out "${DIR}"/Watch49MMHomeScreen.png
-    sips -s format png -Z '172' "${FILE}" --out "${DIR}"/Watch38MMShortLook.png
-    sips -s format png -Z '196' "${FILE}" --out "${DIR}"/Watch40MM42MMShortLook.png
-    sips -s format png -Z '216' "${FILE}" --out "${DIR}"/Watch44MMShortLook.png
-    sips -s format png -Z '234' "${FILE}" --out "${DIR}"/Watch234ShortLook.png
-    sips -s format png -Z '258' "${FILE}" --out "${DIR}"/Watch258ShortLook.png
-    sips -s format png -Z '1024' "${FILE}" --out "${DIR}"/WatchAppStore.png
-
-    # https://developer.apple.com/library/archive/documentation/Xcode/Reference/xcode_ref-Asset_Catalog_Format/AppIconType.html
-    contents_json='{"images":[{"size":"24x24","idiom":"watch","scale":"2x","filename":"Watch38mmNotificationCenter.png","role":"notificationCenter","subtype":"38mm"},{"size":"27.5x27.5","idiom":"watch","scale":"2x","filename":"Watch42mmNotificationCenter.png","role":"notificationCenter","subtype":"42mm"},{"size":"29x29","idiom":"watch","filename":"WatchCompanionSettings@2x.png","role":"companionSettings","scale":"2x"},{"size":"29x29","idiom":"watch","filename":"WatchCompanionSettings@3x.png","role":"companionSettings","scale":"3x"},{"size":"40x40","idiom":"watch","filename":"Watch38MM42MMHomeScreen.png","scale":"2x","role":"appLauncher","subtype":"38mm"},{"size":"44x44","idiom":"watch","scale":"2x","filename":"Watch40MMHomeScreen.png","role":"appLauncher","subtype":"40mm"},{"size":"50x50","idiom":"watch","scale":"2x","filename":"Watch44MMHomeScreen.png","role":"appLauncher","subtype":"44mm"},{"size":"86x86","idiom":"watch","scale":"2x","filename":"Watch38MMShortLook.png","role":"quickLook","subtype":"38mm"},{"size":"98x98","idiom":"watch","scale":"2x","filename":"Watch40MM42MMShortLook.png","role":"quickLook","subtype":"42mm"},{"size":"108x108","idiom":"watch","scale":"2x","filename":"Watch44MMShortLook.png","role":"quickLook","subtype":"44mm"},{"idiom":"watch-marketing","filename":"WatchAppStore.png","size":"1024x1024","scale":"1x"}],"info":{"version":1,"author":"xcode"}}'
-    echo $contents_json > "${DIR}"/Contents.json
-fi
-
-if [[ "$PLATFORM" == *"complication"* ]] ; then # Apple Watch
-    sips -s format png -Z '32'  "${FILE}" --out "${DIR}"/Circular38mm2x.png
-    sips -s format png -Z '36'  "${FILE}" --out "${DIR}"/Circular40mm2x.png
-    sips -s format png -Z '36'  "${FILE}" --out "${DIR}"/Circular42mm2x.png
-    sips -s format png -Z '40'  "${FILE}" --out "${DIR}"/Circular44mm2x.png
-    sips -s format png -Z '182'  "${FILE}" --out "${DIR}"/ExtraLarge38mm2x.png
-    sips -s format png -Z '203'  "${FILE}" --out "${DIR}"/ExtraLarge40mm2x.png
-    sips -s format png -Z '203'  "${FILE}" --out "${DIR}"/ExtraLarge42mm2x.png
-    sips -s format png -Z '224'  "${FILE}" --out "${DIR}"/ExtraLarge44mm2x.png
-    sips -s format png -Z '84'  "${FILE}" --out "${DIR}"/GraphicBezel40mm2x.png
-    sips -s format png -Z '84'  "${FILE}" --out "${DIR}"/GraphicBezel42mm2x.png
-    sips -s format png -Z '94'  "${FILE}" --out "${DIR}"/GraphicBezel44mm2x.png
-    sips -s format png -Z '84'  "${FILE}" --out "${DIR}"/GraphicCircular40mm2x.png
-    sips -s format png -Z '84'  "${FILE}" --out "${DIR}"/GraphicCircular42mm2x.png
-    sips -s format png -Z '94'  "${FILE}" --out "${DIR}"/GraphicCircular44mm2x.png
-    sips -s format png -Z '40'  "${FILE}" --out "${DIR}"/GraphicCorner40mm2x.png
-    sips -s format png -Z '40'  "${FILE}" --out "${DIR}"/GraphicCorner42mm2x.png
-    sips -s format png -Z '44'  "${FILE}" --out "${DIR}"/GraphicCorner44mm2x.png
-    sips -s format png -Z '52'  "${FILE}" --out "${DIR}"/GraphicModular38mm2x.png
-    sips -s format png -Z '58'  "${FILE}" --out "${DIR}"/GraphicModular40mm2x.png
-    sips -s format png -Z '58'  "${FILE}" --out "${DIR}"/GraphicModular42mm2x.png
-    sips -s format png -Z '64'  "${FILE}" --out "${DIR}"/GraphicModular44mm2x.png
-    sips -s format png -Z '40'  "${FILE}" --out "${DIR}"/GraphicUtilitarian38mm2x.png
-    sips -s format png -Z '44'  "${FILE}" --out "${DIR}"/GraphicUtilitarian40mm2x.png
-    sips -s format png -Z '44'  "${FILE}" --out "${DIR}"/GraphicUtilitarian42mm2x.png
-    sips -s format png -Z '50'  "${FILE}" --out "${DIR}"/GraphicUtilitarian44mm2x.png
-    sips -s format png -Z '206'  "${FILE}" --out "${DIR}"/GraphicExtraLarge38mm2x.png
-    sips -s format png -Z '264'  "${FILE}" --out "${DIR}"/GraphicExtraLarge44mm2x.png
-    echo "NOTE: Graphic Extra Large is not generated since that is not rectangular"
-fi
-
-if [[ "$PLATFORM" == *"macos"* ]] ; then # macOS
-    sips -s format png -Z '1024' "${FILE}" --out "${DIR}"/icon_512x512@2x.png
-    sips -s format png -Z '512'  "${FILE}" --out "${DIR}"/icon_512x512.png
-    sips -s format png -Z '512'  "${FILE}" --out "${DIR}"/icon_256x256@2x.png
-    sips -s format png -Z '256'  "${FILE}" --out "${DIR}"/icon_256x256.png
-    sips -s format png -Z '256'  "${FILE}" --out "${DIR}"/icon_128x128@2x.png
-    sips -s format png -Z '128'  "${FILE}" --out "${DIR}"/icon_128x128.png
-    sips -s format png -Z '64'   "${FILE}" --out "${DIR}"/icon_32x32@2x.png
-    sips -s format png -Z '32'   "${FILE}" --out "${DIR}"/icon_32x32.png
-    sips -s format png -Z '32'   "${FILE}" --out "${DIR}"/icon_16x16@2x.png
-    sips -s format png -Z '16'   "${FILE}" --out "${DIR}"/icon_16x16.png
-fi

build.cake

@@ -4,7 +4,6 @@
 #addin nuget:?package=Cake.Incubator&version=7.0.0
 #tool dotnet:?package=GitVersion.Tool&version=5.10.3
 using Path = System.IO.Path;
-using System.Text.RegularExpressions;
 
 var debugScript = Argument<bool>("debugScript", false);
 var target = Argument("target", "Default");
@@ -36,7 +35,6 @@ VariantConfig GetVariant() => variant.ToLower() switch{
 GitVersion _gitVersion; //will be set by GetGitInfo task
 var _slnPath = Path.Combine(""); //base path used to access files. If build.cake file is moved, just update this
 string _androidPackageName = string.Empty; //will be set by UpdateAndroidManifest task
-string _iOSVersionName = string.Empty;  //will be set by UpdateiOSPlist task
 string CreateFeatureBranch(string prevVersionName, GitVersion git) => $"{prevVersionName}-{git.BranchName.Replace("/","-")}";
 string GetVersionName(string prevVersionName, VariantConfig buildVariant, GitVersion git) => buildVariant is Prod? prevVersionName : CreateFeatureBranch(prevVersionName, git); 
 int CreateBuildNumber(int previousNumber) => ++previousNumber; 
@@ -165,8 +163,7 @@ enum iOSProjectType
     MainApp,
     Autofill,
     Extension,
-    ShareExtension,
-    WatchApp
+    ShareExtension
 }
 
 string GetiOSBundleId(VariantConfig buildVariant, iOSProjectType projectType) => projectType switch
@@ -174,7 +171,6 @@ string GetiOSBundleId(VariantConfig buildVariant, iOSProjectType projectType) =>
     iOSProjectType.Autofill => $"{buildVariant.iOSBundleId}.autofill",
     iOSProjectType.Extension => $"{buildVariant.iOSBundleId}.find-login-action-extension",
     iOSProjectType.ShareExtension => $"{buildVariant.iOSBundleId}.share-extension",
-    iOSProjectType.WatchApp => $"{buildVariant.iOSBundleId}.watchkitapp",
     _ => buildVariant.iOSBundleId
 };
 
@@ -209,7 +205,6 @@ private void UpdateiOSInfoPlist(string plistPath, VariantConfig buildVariant, Gi
 
     if(projectType == iOSProjectType.MainApp)
     {
-        _iOSVersionName = newVersionName;
         plist["CFBundleURLTypes"][0]["CFBundleURLName"] = $"{buildVariant.iOSBundleId}.url";
     }
 
@@ -245,79 +240,10 @@ private void UpdateiOSEntitlementsPlist(string entitlementsPath, VariantConfig b
     Information($"{entitlementsPath} updated with success!");
 }
 
-private void UpdateWatchKitAppInfoPlist(string plistPath, VariantConfig buildVariant)
-{
-    var plistFile = File(plistPath);
-    dynamic plist = DeserializePlist(plistFile);
-
-    var prevBundleId = plist["NSExtension"]["NSExtensionAttributes"]["WKAppBundleIdentifier"];
-    var newBundleId = GetiOSBundleId(buildVariant, iOSProjectType.WatchApp);
-
-    plist["NSExtension"]["NSExtensionAttributes"]["WKAppBundleIdentifier"] = newBundleId;
-
-    SerializePlist(plistFile, plist);
-
-    Information($"Changed Bundle Identifier from {prevBundleId} to {newBundleId}");
-    Information($"{plistPath} updated with success!");
-}
-
-private void UpdateWatchPbxproj(string pbxprojPath, string newVersion)
-{
-    var fileText = FileReadText(pbxprojPath);
-    if (string.IsNullOrEmpty(fileText))
-    {
-        throw new Exception($"Couldn't find {pbxprojPath}");
-    }
-
-    const string pattern = @"MARKETING_VERSION = [^;]*;";
-
-    fileText = Regex.Replace(fileText, pattern, $"MARKETING_VERSION = {newVersion};");
-
-    FileWriteText(pbxprojPath, fileText);
-    Information($"{pbxprojPath} modified successfully.");
-}
-
-/// <summary>
-/// Updates the target icons on the given appiconset target
-/// taking as source the icon in appIcons/iOS folder for the giving variant
-/// </summary>
-/// <param name="target">It can be <ios|watch|complication|macos></param>
-/// <param name="appiconsetTarget">Folder to copy the generated icons to</param>
-private void UpdateAppleIcons(string target, string appiconsetTarget)
-{
-    Information($"Updating {target} App Icons");
-
-    var iconsTempDirPath = Path.Combine(_slnPath, "appIcons", "temp");
-    CreateDirectory(iconsTempDirPath);
-
-    var arguments = new ProcessArgumentBuilder();
-    arguments.Append(target);
-    arguments.Append(Path.Combine(_slnPath, "appIcons", "iOS", $"{variant}.png"));
-    arguments.Append(iconsTempDirPath);
-
-    using(var process = StartAndReturnProcess(Path.Combine(_slnPath, "appIcons", "icongen.sh"), 
-        new ProcessSettings { Arguments = arguments }))
-    {
-        process.WaitForExit();
-        Information("Exit code: {0}", process.GetExitCode());
-    }
-
-    var generatedIconsPath = Path.Combine(iconsTempDirPath, "*.png");
-    CopyFiles(generatedIconsPath, appiconsetTarget);        
-
-    DeleteDirectory(iconsTempDirPath, new DeleteDirectorySettings {
-        Recursive = true,
-        Force = true
-    });
-
-    Information($"{target} App Icons have been updated");
-}
-
-Task("UpdateiOSIcons")
+Task("UpdateiOSIcon")
     .Does(()=>{
-        UpdateAppleIcons("ios", Path.Combine(_slnPath, "src", "iOS", "Resources", "Assets.xcassets", "AppIcons.appiconset"));
-        UpdateAppleIcons("watch", Path.Combine(_slnPath, "src", "watchOS", "bitwarden", "bitwarden WatchKit App", "Assets.xcassets", "AppIcon.appiconset"));
-        // TODO: Update complication icons when they start working
+        //TODO we'll implement variant icons later
+        Information($"Updating IOS App Icon");
     });
 
 Task("UpdateiOSPlist")
@@ -370,10 +296,8 @@ Task("UpdateiOSCodeFiles")
         var fileList = new string[] {
             Path.Combine(_slnPath, "src", "iOS.Core", "Utilities", "iOSCoreHelpers.cs"),
             Path.Combine(_slnPath, "src", "iOS.Core", "Constants.cs"),
-            Path.Combine(_slnPath, "src", "watchOS", "bitwarden", "bitwarden.xcodeproj", "project.pbxproj"),
-            Path.Combine(_slnPath, "src", "watchOS", "bitwarden", "bitwarden WatchKit Extension", "Helpers", "KeychainHelper.swift"),
             Path.Combine(".github", "resources", "export-options-ad-hoc.plist"),
-            Path.Combine(".github", "resources", "export-options-app-store.plist")
+            Path.Combine(".github", "resources", "export-options-app-store.plist"),
         };
 
         foreach(string path in fileList)
@@ -381,22 +305,6 @@ Task("UpdateiOSCodeFiles")
             ReplaceInFile(path, "com.8bit.bitwarden", buildVariant.iOSBundleId);
         }
     });
-
-Task("UpdateWatchProject")
-    .IsDependentOn("UpdateiOSPlist")
-    .WithCriteria(() => !string.IsNullOrEmpty(_iOSVersionName))
-    .Does(()=> {
-        var watchProjectPath = Path.Combine(_slnPath, "src", "watchOS", "bitwarden", "bitwarden.xcodeproj", "project.pbxproj");
-        UpdateWatchPbxproj(watchProjectPath, _iOSVersionName);
-    });
-
-Task("UpdateWatchKitAppInfoPlist")
-    .Does(()=> {
-        var buildVariant = GetVariant();
-        var infoPath = Path.Combine(_slnPath, "src", "watchOS", "bitwarden", "bitwarden WatchKit Extension", "Info.plist");
-        UpdateWatchKitAppInfoPlist(infoPath, buildVariant);
-    });
-
 #endregion iOS
 
 #region Main Tasks
@@ -410,14 +318,12 @@ Task("Android")
     });
 
 Task("iOS")
-    .IsDependentOn("UpdateiOSIcons")
+    //.IsDependentOn("UpdateiOSIcon")
     .IsDependentOn("UpdateiOSPlist")
     .IsDependentOn("UpdateiOSAutofillPlist")
     .IsDependentOn("UpdateiOSExtensionPlist")
     .IsDependentOn("UpdateiOSShareExtensionPlist")
     .IsDependentOn("UpdateiOSCodeFiles")
-    .IsDependentOn("UpdateWatchProject")
-    .IsDependentOn("UpdateWatchKitAppInfoPlist")
     .Does(()=>
     {
         Information("iOS app updated");

src/Android/Android.csproj

@@ -78,20 +78,21 @@
       <Version>1.9.0</Version>
     </PackageReference>
     <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.AutoFill" Version="1.1.0.14" />
+    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.17" />
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.15" />
     <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.3.1.1" />
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.7.5</Version>
+      <Version>1.7.3</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Firebase.Messaging">
-      <Version>123.1.1.1</Version>
+      <Version>123.0.8</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Google.Dagger" Version="2.44.2.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Dagger" Version="2.41.0.2" />
     <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
-      <Version>118.0.1.3</Version>
+      <Version>118.0.1.2</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

src/Android/Autofill/FieldCollection.cs

@@ -102,7 +102,7 @@ namespace Bit.Droid.Autofill
 
                     if (!_usernameFields.Any())
                     {
-                        _usernameFields = Fields.Where(f => FieldIsUsername(f)).ToList();
+                        _usernameFields = Fields.Where(f => FieldHasUsernameTerms(f)).ToList();
                     }
                 }
                 return _usernameFields;
@@ -327,18 +327,13 @@ namespace Bit.Droid.Autofill
             }
 
             return inputTypePassword && !ValueContainsAnyTerms(f.IdEntry, _ignoreSearchTerms) &&
-                !ValueContainsAnyTerms(f.Hint, _ignoreSearchTerms) && !FieldIsUsername(f);
+                !ValueContainsAnyTerms(f.Hint, _ignoreSearchTerms) && !FieldHasUsernameTerms(f);
         }
 
         private bool FieldHasPasswordTerms(Field f)
         {
             return ValueContainsAnyTerms(f.IdEntry, _passwordTerms) || ValueContainsAnyTerms(f.Hint, _passwordTerms);
         }
-        
-        private bool FieldIsUsername(Field f)
-        {
-            return f.InputType.HasFlag(InputTypes.TextVariationWebEmailAddress) || FieldHasUsernameTerms(f);
-        }
 
         private bool FieldHasUsernameTerms(Field f)
         {
@@ -355,4 +350,4 @@ namespace Bit.Droid.Autofill
             return terms.Any(t => lowerValue.Contains(t));
         }
     }
-}
+}

src/Android/MainActivity.cs

@@ -44,7 +44,6 @@ namespace Bit.Droid
         private IAppIdService _appIdService;
         private IEventService _eventService;
         private IPushNotificationListenerService _pushNotificationListenerService;
-        private IVaultTimeoutService _vaultTimeoutService;
         private ILogger _logger;
         private PendingIntent _eventUploadPendingIntent;
         private AppOptions _appOptions;
@@ -69,7 +68,6 @@ namespace Bit.Droid
             _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
             _eventService = ServiceContainer.Resolve<IEventService>("eventService");
             _pushNotificationListenerService = ServiceContainer.Resolve<IPushNotificationListenerService>();
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>();
             _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             TabLayoutResource = Resource.Layout.Tabbar;
@@ -172,7 +170,7 @@ namespace Bit.Droid
             {
                 if (intent?.GetStringExtra("uri") is string uri)
                 {
-                    _messagingService.Send(App.App.POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE);
+                    _messagingService.Send("popAllAndGoToAutofillCiphers");
                     if (_appOptions != null)
                     {
                        _appOptions.Uri = uri;
@@ -180,7 +178,7 @@ namespace Bit.Droid
                 }
                 else if (intent.GetBooleanExtra("generatorTile", false))
                 {
-                    _messagingService.Send(App.App.POP_ALL_AND_GO_TO_TAB_GENERATOR_MESSAGE);
+                    _messagingService.Send("popAllAndGoToTabGenerator");
                     if (_appOptions != null)
                     {
                         _appOptions.GeneratorTile = true;
@@ -188,7 +186,7 @@ namespace Bit.Droid
                 }
                 else if (intent.GetBooleanExtra("myVaultTile", false))
                 {
-                    _messagingService.Send(App.App.POP_ALL_AND_GO_TO_TAB_MYVAULT_MESSAGE);
+                    _messagingService.Send("popAllAndGoToTabMyVault");
                     if (_appOptions != null)
                     {
                         _appOptions.MyVaultTile = true;
@@ -200,7 +198,7 @@ namespace Bit.Droid
                     {
                         _appOptions.CreateSend = GetCreateSendRequest(intent);
                     }
-                    _messagingService.Send(App.App.POP_ALL_AND_GO_TO_TAB_SEND_MESSAGE);
+                    _messagingService.Send("popAllAndGoToTabSend");
                 }
                 else
                 {
@@ -234,7 +232,6 @@ namespace Bit.Droid
 
         protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
         {
-            _vaultTimeoutService.ResetTimeoutDelay = true;
             if (resultCode == Result.Ok &&
                (requestCode == Core.Constants.SelectFileRequestCode || requestCode == Core.Constants.SaveFileRequestCode))
             {

src/Android/MainApplication.cs

@@ -21,7 +21,6 @@ using Bit.App.Utilities;
 using Bit.App.Pages;
 using Bit.App.Utilities.AccountManagement;
 using Bit.App.Controls;
-using Bit.Core.Enums;
 #if !FDROID
 using Android.Gms.Security;
 #endif
@@ -82,8 +81,7 @@ namespace Bit.Droid
                     ServiceContainer.Resolve<IAuthService>("authService"),
                     ServiceContainer.Resolve<ILogger>("logger"),
                     ServiceContainer.Resolve<IMessagingService>("messagingService"),
-                    ServiceContainer.Resolve<IWatchDeviceService>(),
-                    ServiceContainer.Resolve<IConditionedAwaiterManager>());
+                    ServiceContainer.Resolve<IWatchDeviceService>());
                 ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
             }
 #if !FDROID
@@ -145,10 +143,9 @@ namespace Bit.Droid
             var secureStorageService = new SecureStorageService();
             var cryptoPrimitiveService = new CryptoPrimitiveService();
             var mobileStorageService = new MobileStorageService(preferencesStorage, liteDbStorage);
-            var storageMediatorService = new StorageMediatorService(mobileStorageService, secureStorageService, preferencesStorage);
-            var stateService = new StateService(mobileStorageService, secureStorageService, storageMediatorService, messagingService);
+            var stateService = new StateService(mobileStorageService, secureStorageService, messagingService);
             var stateMigrationService =
-                new StateMigrationService(DeviceType.Android, liteDbStorage, preferencesStorage, secureStorageService);
+                new StateMigrationService(liteDbStorage, preferencesStorage, secureStorageService);
             var clipboardService = new ClipboardService(stateService);
             var deviceActionService = new DeviceActionService(stateService, messagingService);
             var fileService = new FileService(stateService, broadcasterService);
@@ -156,12 +153,11 @@ namespace Bit.Droid
                 messagingService, broadcasterService);
             var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService,
                 platformUtilsService, new LazyResolve<IEventService>());
-            var biometricService = new BiometricService(stateService);
+            var biometricService = new BiometricService();
             var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
             var cryptoService = new CryptoService(stateService, cryptoFunctionService);
             var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);
 
-            ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
             ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
             ServiceContainer.Register<IMessagingService>("messagingService", messagingService);
             ServiceContainer.Register<ILocalizeService>("localizeService", localizeService);
@@ -169,7 +165,6 @@ namespace Bit.Droid
             ServiceContainer.Register<ICryptoPrimitiveService>("cryptoPrimitiveService", cryptoPrimitiveService);
             ServiceContainer.Register<IStorageService>("storageService", mobileStorageService);
             ServiceContainer.Register<IStorageService>("secureStorageService", secureStorageService);
-            ServiceContainer.Register<IStorageMediatorService>(storageMediatorService);
             ServiceContainer.Register<IStateService>("stateService", stateService);
             ServiceContainer.Register<IStateMigrationService>("stateMigrationService", stateMigrationService);
             ServiceContainer.Register<IClipboardService>("clipboardService", clipboardService);
@@ -202,9 +197,7 @@ namespace Bit.Droid
 
         private void Bootstrap()
         {
-            var locale = ServiceContainer.Resolve<IStateService>().GetLocale();
-            (ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService)
-                .Init(locale != null ? new System.Globalization.CultureInfo(locale) : null);
+            (ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService).Init();
             ServiceContainer.Resolve<IAuthService>("authService").Init();
             // Note: This is not awaited
             var bootstrapTask = BootstrapAsync();

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.5.1" 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.2.0" 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" />
@@ -45,11 +45,11 @@
 	<queries>
 		<intent>
 			<action android:name="android.intent.action.VIEW" />
-			<data android:scheme="http" />
+			<data android:scheme="http"/>
 		</intent>
 		<intent>
 			<action android:name="android.intent.action.VIEW" />
-			<data android:scheme="https" />
+			<data android:scheme="https"/>
 		</intent>
 	</queries>
 </manifest>

src/Android/Services/BiometricService.cs

@@ -4,6 +4,7 @@ using Android.OS;
 using Android.Security.Keystore;
 using Bit.Core.Abstractions;
 using Bit.Core.Services;
+using Bit.Core.Utilities;
 using Java.Security;
 using Javax.Crypto;
 
@@ -11,8 +12,6 @@ namespace Bit.Droid.Services
 {
     public class BiometricService : IBiometricService
     {
-        private readonly IStateService _stateService;
-
         private const string KeyName = "com.8bit.bitwarden.biometric_integrity";
 
         private const string KeyStoreName = "AndroidKeyStore";
@@ -24,28 +23,28 @@ namespace Bit.Droid.Services
 
         private readonly KeyStore _keystore;
 
-        public BiometricService(IStateService stateService)
+        public BiometricService()
         {
-            _stateService = stateService;
             _keystore = KeyStore.GetInstance(KeyStoreName);
             _keystore.Load(null);
         }
 
-        public async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
+        public Task<bool> SetupBiometricAsync(string bioIntegrityKey = null)
         {
+            // bioIntegrityKey used in iOS only
             if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
             {
-                await CreateKeyAsync(bioIntegritySrcKey);
+                CreateKey();
             }
 
-            return true;
+            return Task.FromResult(true);
         }
 
-        public async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
+        public Task<bool> ValidateIntegrityAsync(string bioIntegrityKey = null)
         {
             if (Build.VERSION.SdkInt < BuildVersionCodes.M)
             {
-                return true;
+                return Task.FromResult(true);
             }
 
             try
@@ -56,7 +55,7 @@ namespace Bit.Droid.Services
 
                 if (key == null || cipher == null)
                 {
-                    return true;
+                    return Task.FromResult(true);
                 }
 
                 cipher.Init(CipherMode.EncryptMode, key);
@@ -64,32 +63,25 @@ namespace Bit.Droid.Services
             catch (KeyPermanentlyInvalidatedException e)
             {
                 // Biometric has changed
-                await ClearStateAsync(bioIntegritySrcKey);
-                return false;
+                return Task.FromResult(false);
             }
             catch (UnrecoverableKeyException e)
             {
                 // Biometric was disabled and re-enabled
-                await ClearStateAsync(bioIntegritySrcKey);
-                return false;
+                return Task.FromResult(false);
             }
             catch (InvalidKeyException e)
             {
                 // Fallback for old bitwarden users without a key
                 LoggerHelper.LogEvenIfCantBeResolved(e);
-                await CreateKeyAsync(bioIntegritySrcKey);
+                CreateKey();
             }
 
-            return true;
+            return Task.FromResult(true);
         }
 
-        private async Task CreateKeyAsync(string bioIntegritySrcKey = null)
+        private void CreateKey()
         {
-            bioIntegritySrcKey ??= Core.Constants.BiometricIntegritySourceKey;
-            await _stateService.SetSystemBiometricIntegrityState(bioIntegritySrcKey,
-                await GetStateAsync(bioIntegritySrcKey));
-            await _stateService.SetAccountBiometricIntegrityValidAsync(bioIntegritySrcKey);
-
             try
             {
                 var keyGen = KeyGenerator.GetInstance(KeyAlgorithm, KeyStoreName);
@@ -109,16 +101,5 @@ namespace Bit.Droid.Services
                 LoggerHelper.LogEvenIfCantBeResolved(e);
             }
         }
-
-        private async Task<string> GetStateAsync(string bioIntegritySrcKey)
-        {
-            return await _stateService.GetSystemBiometricIntegrityState(bioIntegritySrcKey) ??
-                   Guid.NewGuid().ToString();
-        }
-
-        private async Task ClearStateAsync(string bioIntegritySrcKey)
-        {
-            await _stateService.SetSystemBiometricIntegrityState(bioIntegritySrcKey, null);
-        }
     }
 }

src/Android/Services/ClipboardService.cs

@@ -49,6 +49,12 @@ namespace Bit.Droid.Services
             }
         }
 
+        public bool IsCopyNotificationHandledByPlatform()
+        {
+            // Android 13+ provides built-in notification when text is copied to the clipboard
+            return (int)Build.VERSION.SdkInt >= 33;
+        }
+
         private void CopyToClipboard(string text, bool isSensitive = true)
         {
             var clipboardManager = Application.Context.GetSystemService(Context.ClipboardService) as ClipboardManager;

src/Android/Services/DeviceActionService.cs

@@ -502,6 +502,11 @@ namespace Bit.Droid.Services
 
         public async Task SetScreenCaptureAllowedAsync()
         {
+            if (CoreHelpers.ForceScreenCaptureEnabled())
+            {
+                return;
+            }
+
             var activity = CrossCurrentActivity.Current?.Activity;
             if (await _stateService.GetScreenCaptureAllowedAsync())
             {

src/Android/Services/WatchDeviceService.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Bit.App.Services;
 using Bit.Core.Abstractions;
+using Bit.Core.Models;
 
 namespace Bit.Droid.Services
 {
@@ -21,7 +22,7 @@ namespace Bit.Droid.Services
 
         protected override bool CanSendData => false;
 
-        protected override Task SendDataToWatchAsync(byte[] rawData) => throw new NotImplementedException();
+        protected override Task SendDataToWatchAsync(WatchDTO watchDto) => throw new NotImplementedException();
 
         protected override void ConnectToWatch() => throw new NotImplementedException();
     }

src/App/Abstractions/IAccountsManager.cs

@@ -8,7 +8,6 @@ namespace Bit.App.Abstractions
     {
         void Init(Func<AppOptions> getOptionsFunc, IAccountsManagerHost accountsManagerHost);
         Task NavigateOnAccountChangeAsync(bool? isAuthed = null);
-        Task StartDefaultNavigationFlowAsync(Action<AppOptions> appOptionsAction);
         Task LogOutAsync(string userId, bool userInitiated, bool expired);
         Task PromptToSwitchToExistingAccountAsync(string userId);
     }

src/App/Abstractions/IDeepLinkContext.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace Bit.App.Abstractions
-{
-    public interface IDeepLinkContext
-    {
-        bool OnNewUri(Uri uri);
-    }
-}

src/App/App.csproj

@@ -14,14 +14,13 @@
 
   <ItemGroup>
     <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.7.5" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.2" />
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.5" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
     <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" />
   </ItemGroup>
 
   <ItemGroup>
@@ -437,8 +436,6 @@
     <None Remove="Utilities\AccountManagement\" />
     <None Remove="Controls\DateTime\" />
     <None Remove="Controls\IconLabelButton\" />
-    <None Remove="MessagePack" />
-    <None Remove="MessagePack.MSBuild.Tasks" />
     <None Remove="Controls\PasswordStrengthProgressBar\" />
   </ItemGroup>
 </Project>

src/App/App.xaml.cs

@@ -23,11 +23,6 @@ namespace Bit.App
 {
     public partial class App : Application, IAccountsManagerHost
     {
-        public const string POP_ALL_AND_GO_TO_TAB_GENERATOR_MESSAGE = "popAllAndGoToTabGenerator";
-        public const string POP_ALL_AND_GO_TO_TAB_MYVAULT_MESSAGE = "popAllAndGoToTabMyVault";
-        public const string POP_ALL_AND_GO_TO_TAB_SEND_MESSAGE = "popAllAndGoToTabSend";
-        public const string POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE = "popAllAndGoToAutofillCiphers";
-
         private readonly IBroadcasterService _broadcasterService;
         private readonly IMessagingService _messagingService;
         private readonly IStateService _stateService;
@@ -38,7 +33,6 @@ namespace Bit.App
         private readonly IFileService _fileService;
         private readonly IAccountsManager _accountsManager;
         private readonly IPushNotificationService _pushNotificationService;
-        private readonly IConfigService _configService;
         private static bool _isResumed;
         // these variables are static because the app is launching new activities on notification click, creating new instances of App. 
         private static bool _pendingCheckPasswordlessLoginRequests;
@@ -62,7 +56,6 @@ namespace Bit.App
             _fileService = ServiceContainer.Resolve<IFileService>();
             _accountsManager = ServiceContainer.Resolve<IAccountsManager>("accountsManager");
             _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();
-            _configService = ServiceContainer.Resolve<IConfigService>();
 
             _accountsManager.Init(() => Options, this);
 
@@ -110,18 +103,12 @@ namespace Bit.App
                         await Task.Delay(1000);
                         await _accountsManager.NavigateOnAccountChangeAsync();
                     }
-                    else if (message.Command == POP_ALL_AND_GO_TO_TAB_GENERATOR_MESSAGE ||
-                        message.Command == POP_ALL_AND_GO_TO_TAB_MYVAULT_MESSAGE ||
-                        message.Command == POP_ALL_AND_GO_TO_TAB_SEND_MESSAGE ||
-                        message.Command == POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE ||
-                        message.Command == DeepLinkContext.NEW_OTP_MESSAGE)
+                    else if (message.Command == "popAllAndGoToTabGenerator" ||
+                        message.Command == "popAllAndGoToTabMyVault" ||
+                        message.Command == "popAllAndGoToTabSend" ||
+                        message.Command == "popAllAndGoToAutofillCiphers")
                     {
-                        if (message.Command == DeepLinkContext.NEW_OTP_MESSAGE)
-                        {
-                            Options.OtpData = new OtpData((string)message.Data);
-                        }
-
-                        await Device.InvokeOnMainThreadAsync(async () =>
+                        Device.BeginInvokeOnMainThread(async () =>
                         {
                             if (Current.MainPage is TabsPage tabsPage)
                             {
@@ -129,29 +116,24 @@ namespace Bit.App
                                 {
                                     await tabsPage.Navigation.PopModalAsync(false);
                                 }
-                                if (message.Command == POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE)
+                                if (message.Command == "popAllAndGoToAutofillCiphers")
                                 {
-                                    Current.MainPage = new NavigationPage(new CipherSelectionPage(Options));
+                                    Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
                                 }
-                                else if (message.Command == POP_ALL_AND_GO_TO_TAB_MYVAULT_MESSAGE)
+                                else if (message.Command == "popAllAndGoToTabMyVault")
                                 {
                                     Options.MyVaultTile = false;
                                     tabsPage.ResetToVaultPage();
                                 }
-                                else if (message.Command == POP_ALL_AND_GO_TO_TAB_GENERATOR_MESSAGE)
+                                else if (message.Command == "popAllAndGoToTabGenerator")
                                 {
                                     Options.GeneratorTile = false;
                                     tabsPage.ResetToGeneratorPage();
                                 }
-                                else if (message.Command == POP_ALL_AND_GO_TO_TAB_SEND_MESSAGE)
+                                else if (message.Command == "popAllAndGoToTabSend")
                                 {
                                     tabsPage.ResetToSendPage();
                                 }
-                                else if (message.Command == DeepLinkContext.NEW_OTP_MESSAGE)
-                                {
-                                    tabsPage.ResetToVaultPage();
-                                    await tabsPage.Navigation.PushModalAsync(new NavigationPage(new CipherSelectionPage(Options)));
-                                }
                             }
                         });
                     }
@@ -163,18 +145,6 @@ namespace Bit.App
                                 new NavigationPage(new RemoveMasterPasswordPage()));
                         });
                     }
-                    else if (message.Command == Constants.ForceUpdatePassword)
-                    {
-                        Device.BeginInvokeOnMainThread(async () =>
-                        {
-                            await Application.Current.MainPage.Navigation.PushModalAsync(
-                                new NavigationPage(new UpdateTempPasswordPage()));
-                        });
-                    }
-                    else if (message.Command == "syncCompleted")
-                    {
-                        await _configService.GetAsync(true);
-                    }
                     else if (message.Command == Constants.PasswordlessLoginRequestKey
                         || message.Command == "unlocked"
                         || message.Command == AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED)
@@ -231,7 +201,7 @@ namespace Bit.App
                 Id = loginRequestData.Id,
                 IpAddress = loginRequestData.RequestIpAddress,
                 Email = await _stateService.GetEmailAsync(),
-                FingerprintPhrase = loginRequestData.FingerprintPhrase,
+                FingerprintPhrase = loginRequestData.RequestFingerprint,
                 RequestDate = loginRequestData.CreationDate,
                 DeviceType = loginRequestData.RequestDeviceType,
                 Origin = loginRequestData.Origin
@@ -297,10 +267,8 @@ namespace Bit.App
             {
                 await _vaultTimeoutService.CheckVaultTimeoutAsync();
                 // Reset delay on every start
-                _vaultTimeoutService.DelayTimeoutMs = null;
+                _vaultTimeoutService.DelayLockAndLogoutMs = null;
             }
-
-            await _configService.GetAsync();
             _messagingService.Send("startEventTimer");
         }
 
@@ -340,7 +308,6 @@ namespace Bit.App
         private async Task SleptAsync()
         {
             await _vaultTimeoutService.CheckVaultTimeoutAsync();
-            await ClearSensitiveFieldsAsync();
             _messagingService.Send("stopEventTimer");
         }
 
@@ -348,7 +315,6 @@ namespace Bit.App
         {
             await _stateService.CheckExtensionActiveUserAndSwitchIfNeededAsync();
             await _vaultTimeoutService.CheckVaultTimeoutAsync();
-            await ClearSensitiveFieldsAsync();
             _messagingService.Send("startEventTimer");
             await UpdateThemeAsync();
             await ClearCacheIfNeededAsync();
@@ -369,14 +335,6 @@ namespace Bit.App
             });
         }
 
-        private async Task ClearSensitiveFieldsAsync()
-        {
-            await Device.InvokeOnMainThreadAsync(() =>
-            {
-                _messagingService.Send(Constants.ClearSensitiveFields);
-            });
-        }
-
         private void SetCulture()
         {
             // Calendars are removed by linker. ref https://bugzilla.xamarin.com/show_bug.cgi?id=59077
@@ -526,8 +484,7 @@ namespace Bit.App
                     Current.MainPage = new NavigationPage(new CipherAddEditPage(appOptions: Options));
                     break;
                 case NavigationTarget.AutofillCiphers:
-                case NavigationTarget.OtpCipherSelection:
-                    Current.MainPage = new NavigationPage(new CipherSelectionPage(Options));
+                    Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
                     break;
                 case NavigationTarget.SendAddEdit:
                     Current.MainPage = new NavigationPage(new SendAddEditPage(Options));

src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
@@ -19,7 +18,7 @@ namespace Bit.App.Controls
             nameof(WebsiteIconsEnabled), typeof(bool?), typeof(CipherViewCell));
 
         public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
-            nameof(ButtonCommand), typeof(ICommand), typeof(CipherViewCell));
+            nameof(ButtonCommand), typeof(Command<CipherView>), typeof(CipherViewCell));
 
         public CipherViewCell()
         {
@@ -43,9 +42,9 @@ namespace Bit.App.Controls
             set => SetValue(CipherProperty, value);
         }
 
-        public ICommand ButtonCommand
+        public Command<CipherView> ButtonCommand
         {
-            get => GetValue(ButtonCommandProperty) as ICommand;
+            get => GetValue(ButtonCommandProperty) as Command<CipherView>;
             set => SetValue(ButtonCommandProperty, value);
         }
 

src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml

@@ -54,9 +54,7 @@
             IsPassword="{Binding ShowHiddenValue, Converter={StaticResource inverseBool}}"
             IsEnabled="{Binding ShowViewHidden}"
             IsSpellCheckEnabled="False"
-            IsTextPredictionEnabled="False"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Field.Name}">
+            IsTextPredictionEnabled="False">
             <Entry.Keyboard>
                 <Keyboard x:FactoryMethod="Create">
                     <x:Arguments>

src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml

@@ -41,9 +41,7 @@
             StyleClass="box-value"
             Grid.Row="1"
             Grid.Column="0"
-            IsVisible="{Binding IsEditing}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Field.Name}" />
+            IsVisible="{Binding IsEditing}" />
         <controls:IconButton
             StyleClass="box-row-button, box-row-button-platform"
             Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"

src/App/Models/AppOptions.cs

@@ -1,6 +1,5 @@
 using System;
 using Bit.Core.Enums;
-using Bit.Core.Utilities;
 
 namespace Bit.App.Models
 {
@@ -24,7 +23,6 @@ namespace Bit.App.Models
         public Tuple<SendType, string, byte[], string> CreateSend { get; set; }
         public bool CopyInsteadOfShareAfterSaving { get; set; }
         public bool HideAccountSwitcher { get; set; }
-        public OtpData? OtpData { get; set; }
 
         public void SetAllFrom(AppOptions o)
         {
@@ -50,7 +48,6 @@ namespace Bit.App.Models
             CreateSend = o.CreateSend;
             CopyInsteadOfShareAfterSaving = o.CopyInsteadOfShareAfterSaving;
             HideAccountSwitcher = o.HideAccountSwitcher;
-            OtpData = o.OtpData;
         }
     }
 }

src/App/Pages/Accounts/BaseChangePasswordViewModel.cs

@@ -1,7 +1,10 @@
-using System.Text;
+using System.Collections.Generic;
+using System.Text;
+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.Models.Domain;
@@ -70,13 +73,13 @@ namespace Bit.App.Pages
             set => SetProperty(ref _policy, value);
         }
 
-        public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
+        public string ShowPasswordIcon => ShowPassword ? "" : "";
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string MasterPassword { get; set; }
         public string ConfirmMasterPassword { get; set; }
         public string Hint { get; set; }
 
-        public virtual async Task InitAsync(bool forceSync = false)
+        public async Task InitAsync(bool forceSync = false)
         {
             if (forceSync)
             {
@@ -159,7 +162,7 @@ namespace Bit.App.Pages
             {
                 if (MasterPassword.Length < Constants.MasterPasswordMinimumChars)
                 {
-                    await _platformUtilsService.ShowDialogAsync(string.Format(AppResources.MasterPasswordLengthValMessageX, Constants.MasterPasswordMinimumChars),
+                    await _platformUtilsService.ShowDialogAsync(AppResources.MasterPasswordLengthValMessage,
                         AppResources.MasterPasswordPolicyValidationTitle, AppResources.Ok);
                     return false;
                 }

src/App/Pages/Accounts/EnvironmentPage.xaml

@@ -34,8 +34,7 @@
                         Placeholder="ex. https://bitwarden.company.com"
                         StyleClass="box-value"
                         ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="ServerUrlEntry"/>
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n SelfHostedEnvironmentFooter}"
@@ -54,8 +53,7 @@
                         x:Name="_webVaultEntry"
                         Text="{Binding WebVaultUrl}"
                         Keyboard="Url"
-                        StyleClass="box-value"
-                        AutomationId="WebVaultUrlEntry"/>
+                        StyleClass="box-value" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row">
                     <Label
@@ -65,8 +63,7 @@
                         x:Name="_apiEntry"
                         Text="{Binding ApiUrl}"
                         Keyboard="Url"
-                        StyleClass="box-value"
-                        AutomationId="ApiUrlEntry"/>
+                        StyleClass="box-value" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row">
                     <Label
@@ -76,8 +73,7 @@
                         x:Name="_identityEntry"
                         Text="{Binding IdentityUrl}"
                         Keyboard="Url"
-                        StyleClass="box-value"
-                        AutomationId="IdentityUrlEntry"/>
+                        StyleClass="box-value" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row">
                     <Label
@@ -89,20 +85,11 @@
                         Keyboard="Url"
                         StyleClass="box-value"
                         ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="IconsUrlEntry"/>
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n CustomEnvironmentFooter}"
                     StyleClass="box-footer-label" />
-                <StackLayout StyleClass="box-row">
-                    <Button Text="{u:I18n LoadFromFile}"
-                            StyleClass="btn-primary"
-                            Command="{Binding LoadFromFileCommand}" />
-                    <Button Text="{u:I18n Clear}"
-                            StyleClass="btn-secondary"
-                            Command="{Binding ClearCommand}" />
-                </StackLayout>
             </StackLayout>
         </StackLayout>
     </ScrollView>

src/App/Pages/Accounts/EnvironmentPageViewModel.cs

@@ -1,15 +1,10 @@
 using System;
-using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
-using Newtonsoft.Json;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -23,21 +18,16 @@ namespace Bit.App.Pages
             _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
 
             PageTitle = AppResources.Settings;
-            BaseUrl = _environmentService.BaseUrl == EnvironmentUrlData.DefaultEU.Base || EnvironmentUrlData.DefaultUS.Base == _environmentService.BaseUrl ?
-                string.Empty : _environmentService.BaseUrl;
+            BaseUrl = _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);
-            LoadFromFileCommand = new AsyncCommand(LoadEnvironmentsFromFile, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-            ClearCommand = new Command(ClearAllUrls);
         }
 
         public ICommand SubmitCommand { get; }
-        public ICommand LoadFromFileCommand { get; }
-        public ICommand ClearCommand { get; }
         public string BaseUrl { get; set; }
         public string ApiUrl { get; set; }
         public string IdentityUrl { get; set; }
@@ -95,75 +85,5 @@ namespace Bit.App.Pages
             _logger.Value.Exception(ex);
             Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok);
         }
-
-        private async Task LoadEnvironmentsFromFile()
-        {
-            try
-            {
-                string jsonString;
-                var result = await FilePicker.PickAsync(new PickOptions
-                {
-                    PickerTitle = "This a test to pick files"
-                });
-                if (result != null)
-                {
-                    if (result.FileName.EndsWith("json", StringComparison.OrdinalIgnoreCase) ||
-                        result.FileName.EndsWith("txt", StringComparison.OrdinalIgnoreCase))
-                    {
-                        var stream = await result.OpenReadAsync();
-                        using (var reader = new System.IO.StreamReader(stream))
-                        {
-                            jsonString = reader.ReadToEnd();
-                        }
-                        var envUrls = JsonConvert.DeserializeObject<EnvironmentsData>(jsonString);
-                        BaseUrl = envUrls.Base;
-                        ApiUrl = envUrls.Api;
-                        IdentityUrl = envUrls.Identity;
-                        WebVaultUrl = envUrls.Vault;
-                        IconsUrl = envUrls.Icons;
-                        NotificationsUrls = envUrls.Notifications;
-                        NotifyUrlsChanged();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                HandleException(ex);
-            }
-        }
-
-        private void ClearAllUrls()
-        {
-            BaseUrl = string.Empty;
-            ApiUrl = string.Empty;
-            IdentityUrl = string.Empty;
-            WebVaultUrl = string.Empty;
-            IconsUrl = string.Empty;
-            NotificationsUrls = string.Empty;
-            NotifyUrlsChanged();
-        }
-
-        private void NotifyUrlsChanged() {
-            TriggerPropertyChanged(nameof(BaseUrl), new[]
-                        {
-                            nameof(ApiUrl),
-                            nameof(IdentityUrl),
-                            nameof(WebVaultUrl),
-                            nameof(IconsUrl),
-                            nameof(NotificationsUrls)
-                        });
-        }
-    }
-
-    public class EnvironmentsData
-    {
-        public string Base { get; set; }
-        public string Admin { get; set; }
-        public string Api { get; set; }
-        public string Identity { get; set; }
-        public string Icons { get; set; }
-        public string Notifications { get; set; }
-        public string Sso { get; set; }
-        public string Vault { get; set; }
     }
 }

src/App/Pages/Accounts/HomePage.xaml

@@ -25,6 +25,10 @@
             AutomationProperties.IsInAccessibleTree="True"
             AutomationProperties.Name="{u:I18n Account}" />
         <ToolbarItem x:Name="_closeButton" Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1"/>
+        <ToolbarItem
+            Icon="cog_environment.png" Clicked="Environment_Clicked" Order="Primary"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Options}" />
     </ContentPage.ToolbarItems>
 
     <ContentPage.Resources>
@@ -49,9 +53,7 @@
                         Keyboard="Email"
                         StyleClass="box-value"
                         ReturnType="Go"
-                        ReturnCommand="{Binding ContinueCommand}"
-                        AutomationId="EmailAddressEntry"
-                        >
+                        ReturnCommand="{Binding ContinueCommand}">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Disabled">
@@ -64,28 +66,7 @@
                     </Entry>
                     <StackLayout
                         Orientation="Horizontal"
-                        Margin="0, 6, 0 ,0">
-                        <StackLayout.GestureRecognizers>
-                            <TapGestureRecognizer
-                                Command="{Binding ShowEnvironmentPickerCommand}" />
-                        </StackLayout.GestureRecognizers>
-                        <Label
-                            Text="{Binding RegionText}"
-                            FontSize="13"
-                            TextColor="{DynamicResource MutedColor}"
-                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"/>
-                        <controls:IconLabel
-                            Text="{Binding SelectedEnvironmentName}"
-                            FontSize="13"
-                            TextColor="{DynamicResource PrimaryColor}"
-                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"
-                            AutomationId="RegionSelectorDropdown"/>
-                    </StackLayout>
-                    <StackLayout
-                        Orientation="Horizontal"
-                        Margin="0, 20, 0 ,0">
+                        Margin="0, 16, 0 ,0">
                         <StackLayout.GestureRecognizers>
                             <TapGestureRecognizer
                                 Command="{Binding RememberEmailCommand}" />
@@ -95,27 +76,21 @@
                             StyleClass="text-sm"
                             HorizontalOptions="FillAndExpand"
                             VerticalOptions="Center"
-                            VerticalTextAlignment="Center"
-                            />
+                            VerticalTextAlignment="Center"/>
                         <Switch
                             Scale="0.8"
                             IsToggled="{Binding RememberEmail}"
-                            VerticalOptions="Center"
-                            AutomationId="RememberMeSwitch"
-                            />
+                            VerticalOptions="Center"/>
                     </StackLayout>
                 </StackLayout>
                 <Button Text="{u:I18n Continue}"
                         StyleClass="btn-primary"
                         IsEnabled="{Binding CanContinue}"
-                        Command="{Binding ContinueCommand}"
-                        AutomationId="ContinueButton"
-                        />
+                        Command="{Binding ContinueCommand}" />
                         
                 <Label FormattedText="{Binding CreateAccountText}"
                        Margin="0, 10"
-                        StyleClass="box-footer-label"
-                        AutomationId="CreateAccountLabel">
+                        StyleClass="box-footer-label">
                     <Label.GestureRecognizers>
                         <TapGestureRecognizer Command="{Binding CreateAccountCommand}" />
                     </Label.GestureRecognizers>
@@ -141,4 +116,5 @@
             MainPage="{Binding Source={x:Reference _page}}"
             BindingContext="{Binding AccountSwitchingOverlayViewModel}"/>
     </AbsoluteLayout>
+
 </pages:BaseContentPage>

src/App/Pages/Accounts/HomePage.xaml.cs

@@ -15,8 +15,6 @@ namespace Bit.App.Pages
         private readonly AppOptions _appOptions;
         private IBroadcasterService _broadcasterService;
 
-        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
-
         public HomePage(AppOptions appOptions = null)
         {
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
@@ -72,14 +70,6 @@ namespace Bit.App.Pages
                     });
                 }
             });
-            try
-            {
-                await _vm.UpdateEnvironment();
-            }
-            catch (Exception ex)
-            {
-                _logger.Value?.Exception(ex);
-            }
         }
 
         protected override bool OnBackButtonPressed()
@@ -138,6 +128,14 @@ namespace Bit.App.Pages
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
 
+        private void Environment_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.StartEnvironmentAction();
+            }
+        }
+
         private async Task StartEnvironmentAsync()
         {
             await _accountListOverlay.HideAsync();

src/App/Pages/Accounts/HomePageViewModel.cs

@@ -4,10 +4,7 @@ using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
 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;
@@ -20,19 +17,16 @@ namespace Bit.App.Pages
     {
         private readonly IStateService _stateService;
         private readonly IMessagingService _messagingService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly ILogger _logger;
-        private readonly IEnvironmentService _environmentService;
-        private readonly IAccountsManager _accountManager;
-        private readonly IConfigService _configService;
 
         private bool _showCancelButton;
         private bool _rememberEmail;
         private string _email;
-        private string _selectedEnvironmentName;
         private bool _isEmailEnabled;
         private bool _canLogin;
-        private bool _displayEuEnvironment;
+        private IPlatformUtilsService _platformUtilsService;
+        private ILogger _logger;
+        private IEnvironmentService _environmentService;
+        private IAccountsManager _accountManager;
 
         public HomeViewModel()
         {
@@ -42,7 +36,6 @@ namespace Bit.App.Pages
             _logger = ServiceContainer.Resolve<ILogger>();
             _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
             _accountManager = ServiceContainer.Resolve<IAccountsManager>();
-            _configService = ServiceContainer.Resolve<IConfigService>();
 
             PageTitle = AppResources.Bitwarden;
 
@@ -56,8 +49,6 @@ namespace Bit.App.Pages
                 onException: _logger.Exception, allowsMultipleExecutions: false);
             CloseCommand = new AsyncCommand(async () => await Device.InvokeOnMainThreadAsync(CloseAction),
                 onException: _logger.Exception, allowsMultipleExecutions: false);
-            ShowEnvironmentPickerCommand = new AsyncCommand(ShowEnvironmentPickerAsync,
-                onException: _logger.Exception, allowsMultipleExecutions: false);
             InitAsync().FireAndForget();
         }
 
@@ -80,13 +71,6 @@ namespace Bit.App.Pages
                 additionalPropertyNames: new[] { nameof(CanContinue) });
         }
 
-        public string SelectedEnvironmentName
-        {
-            get => $"{_selectedEnvironmentName} {BitwardenIcons.AngleDown}";
-            set => SetProperty(ref _selectedEnvironmentName, value);
-        }
-
-        public string RegionText => $"{AppResources.Region}:";
         public bool CanContinue => !string.IsNullOrEmpty(Email);
 
         public FormattedString CreateAccountText
@@ -117,13 +101,11 @@ namespace Bit.App.Pages
         public AsyncCommand ContinueCommand { get; }
         public AsyncCommand CloseCommand { get; }
         public AsyncCommand CreateAccountCommand { get; }
-        public AsyncCommand ShowEnvironmentPickerCommand { get; }
 
         public async Task InitAsync()
         {
             Email = await _stateService.GetRememberedEmailAsync();
             RememberEmail = !string.IsNullOrEmpty(Email);
-            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag, forceRefresh: true);
         }
 
         public async Task ContinueToLoginStepAsync()
@@ -162,59 +144,5 @@ namespace Bit.App.Pages
                 await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage, AppResources.AnErrorHasOccurred, AppResources.Ok);
             }
         }
-
-        public async Task ShowEnvironmentPickerAsync()
-        {
-            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag);
-            var options = _displayEuEnvironment
-                    ? new string[] { AppResources.US, AppResources.EU, AppResources.SelfHosted }
-                    : new string[] { AppResources.US, AppResources.SelfHosted };
-
-            await Device.InvokeOnMainThreadAsync(async () =>
-            {
-                var result = await Page.DisplayActionSheet(AppResources.DataRegion, AppResources.Cancel, null, options);
-
-                if (result is null || result == AppResources.Cancel)
-                {
-                    return;
-                }
-
-                if (result == AppResources.SelfHosted)
-                {
-                    StartEnvironmentAction?.Invoke();
-                    return;
-                }
-
-                await _environmentService.SetUrlsAsync(result == AppResources.EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
-                await _configService.GetAsync(true);
-                SelectedEnvironmentName = result;
-            });
-        }
-
-        public async Task UpdateEnvironment()
-        {
-            var environmentsSaved = await _stateService.GetPreAuthEnvironmentUrlsAsync();
-            if (environmentsSaved == null || environmentsSaved.IsEmpty)
-            {
-                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
-            {
-                await _configService.GetAsync(true);
-                SelectedEnvironmentName = AppResources.SelfHosted;
-            }
-        }
     }
 }

src/App/Pages/Accounts/LockPage.xaml

@@ -71,8 +71,7 @@
                                 Grid.Row="1"
                                 Grid.Column="0"
                                 ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}" 
-                                AutomationId="PinEntry"/>
+                                ReturnCommand="{Binding SubmitCommand}" />
                             <controls:IconButton
                                 StyleClass="box-row-button, box-row-button-platform"
                                 Text="{Binding ShowPasswordIcon}"
@@ -82,8 +81,7 @@
                                 Grid.RowSpan="2"
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{u:I18n ToggleVisibility}" 
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                AutomationId="PinVisibilityToggle"/>
+                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
                         </Grid>
                         <Grid
                             x:Name="_passwordGrid"
@@ -113,8 +111,7 @@
                                 Grid.Row="1"
                                 Grid.Column="0"
                                 ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}"
-                                AutomationId="MasterPasswordEntry"/>
+                                ReturnCommand="{Binding SubmitCommand}" />
                             <controls:IconButton
                                 StyleClass="box-row-button, box-row-button-platform"
                                 Text="{Binding ShowPasswordIcon}"
@@ -124,9 +121,7 @@
                                 Grid.RowSpan="2"
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                AutomationId="PasswordVisibilityToggle"
-                                />
+                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                         </Grid>
                         <StackLayout
                             StyleClass="box-row"
@@ -142,7 +137,7 @@
                     </StackLayout>
                     <StackLayout Padding="10, 0">
                         <Label
-                            Text="{u:I18n AccountBiometricInvalidated}"
+                            Text="{u:I18n BiometricInvalidated}"
                             StyleClass="box-footer-label,text-danger,text-bold"
                             IsVisible="{Binding BiometricIntegrityValid, Converter={StaticResource inverseBool}}" />
                         <Button Text="{Binding BiometricButtonText}" Clicked="Biometric_Clicked"
@@ -152,8 +147,7 @@
                             x:Name="_unlockButton"
                             Text="{u:I18n Unlock}"
                             StyleClass="btn-primary"
-                            Clicked="Unlock_Clicked"
-                            AutomationId="UnlockVaultButton"/>
+                            Clicked="Unlock_Clicked" />
                     </StackLayout>
                 </StackLayout>
             </ScrollView>

src/App/Pages/Accounts/LockPage.xaml.cs

@@ -3,8 +3,6 @@ using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
@@ -12,7 +10,6 @@ namespace Bit.App.Pages
 {
     public partial class LockPage : BaseContentPage
     {
-        private readonly IBroadcasterService _broadcasterService;
         private readonly AppOptions _appOptions;
         private readonly bool _autoPromptBiometric;
         private readonly LockPageViewModel _vm;
@@ -25,7 +22,6 @@ namespace Bit.App.Pages
             _appOptions = appOptions;
             _autoPromptBiometric = autoPromptBiometric;
             InitializeComponent();
-            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>();
             _vm = BindingContext as LockPageViewModel;
             _vm.Page = this;
             _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(async () => await UnlockedAsync());
@@ -68,13 +64,6 @@ namespace Bit.App.Pages
         protected override async void OnAppearing()
         {
             base.OnAppearing();
-            _broadcasterService.Subscribe(nameof(LockPage), message =>
-            {
-                if (message.Command == Constants.ClearSensitiveFields)
-                {
-                    Device.BeginInvokeOnMainThread(_vm.ResetPinPasswordFields);
-                }
-            });
             if (_appeared)
             {
                 return;
@@ -140,7 +129,6 @@ namespace Bit.App.Pages
             base.OnDisappearing();
 
             _accountAvatar?.OnDisappearing();
-            _broadcasterService.Unsubscribe(nameof(LockPage));
         }
 
         private void Unlock_Clicked(object sender, EventArgs e)

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -9,7 +9,6 @@ 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;
 using Xamarin.CommunityToolkit.Helpers;
 using Xamarin.Forms;
@@ -31,12 +30,8 @@ namespace Bit.App.Pages
         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 string _email;
-        private string _masterPassword;
-        private string _pin;
         private bool _showPassword;
         private bool _pinLock;
         private bool _biometricLock;
@@ -63,8 +58,6 @@ namespace Bit.App.Pages
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
             _logger = ServiceContainer.Resolve<ILogger>("logger");
             _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
-            _policyService = ServiceContainer.Resolve<IPolicyService>();
-            _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>();
 
             PageTitle = AppResources.VerifyMasterPassword;
             TogglePasswordCommand = new Command(TogglePassword);
@@ -77,18 +70,6 @@ namespace Bit.App.Pages
             };
         }
 
-        public string MasterPassword
-        {
-            get => _masterPassword;
-            set => SetProperty(ref _masterPassword, value);
-        }
-
-        public string Pin
-        {
-            get => _pin;
-            set => SetProperty(ref _pin, value);
-        }
-
         public bool ShowPassword
         {
             get => _showPassword;
@@ -153,6 +134,8 @@ namespace Bit.App.Pages
         public Command TogglePasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
+        public string MasterPassword { get; set; }
+        public string Pin { get; set; }
         public Action UnlockedAction { get; set; }
         public event Action<int?> FocusSecretEntry
         {
@@ -209,7 +192,7 @@ namespace Bit.App.Pages
 
             if (BiometricLock)
             {
-                BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
+                BiometricIntegrityValid = await _biometricService.ValidateIntegrityAsync();
                 if (!_biometricIntegrityValid)
                 {
                     BiometricButtonVisible = false;
@@ -298,7 +281,6 @@ namespace Bit.App.Pages
                 var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdfConfig);
                 var storedKeyHash = await _cryptoService.GetKeyHashAsync();
                 var passwordValid = false;
-                MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;
 
                 if (storedKeyHash != null)
                 {
@@ -310,11 +292,9 @@ namespace Bit.App.Pages
                     var keyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
                     var request = new PasswordVerificationRequest();
                     request.MasterPasswordHash = keyHash;
-
                     try
                     {
-                        var response = await _apiService.PostAccountVerifyPasswordAsync(request);
-                        enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
+                        await _apiService.PostAccountVerifyPasswordAsync(request);
                         passwordValid = true;
                         var localKeyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
                         await _cryptoService.SetKeyHashAsync(localKeyHash);
@@ -335,14 +315,6 @@ namespace Bit.App.Pages
                         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
-                        await _stateService.SetForcePasswordResetReasonAsync(
-                            ForcePasswordResetReason.WeakMasterPasswordOnLogin);
-                    }
-
                     MasterPassword = string.Empty;
                     await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                     await SetKeyAndContinueAsync(key);
@@ -367,37 +339,6 @@ namespace Bit.App.Pages
             }
         }
 
-        /// <summary>
-        /// Checks if the master password requires updating to meet the enforced policy requirements
-        /// </summary>
-        /// <param name="options"></param>
-        private async Task<bool> RequirePasswordChangeAsync(MasterPasswordPolicyOptions options = null)
-        {
-            // If no policy options are provided, attempt to load them from the policy service
-            var enforcedOptions = options ?? await _policyService.GetMasterPasswordPolicyOptions();
-
-            // No policy to enforce on login/unlock
-            if (!(enforcedOptions is { EnforceOnLogin: true }))
-            {
-                return false;
-            }
-
-            var strength = _passwordGenerationService.PasswordStrength(
-                MasterPassword, _passwordGenerationService.GetPasswordStrengthUserInput(_email))?.Score;
-
-            if (!strength.HasValue)
-            {
-                _logger.Error("Unable to evaluate master password strength during unlock");
-                return false;
-            }
-
-            return !await _policyService.EvaluateMasterPassword(
-                strength.Value,
-                MasterPassword,
-                enforcedOptions
-            );
-        }
-
         public async Task LogOutAsync()
         {
             var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.LogoutConfirmation,
@@ -408,20 +349,6 @@ namespace Bit.App.Pages
             }
         }
 
-        public void ResetPinPasswordFields()
-        {
-            try
-            {
-                MasterPassword = string.Empty;
-                Pin = string.Empty;
-                ShowPassword = false;
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-            }
-        }
-
         public void TogglePassword()
         {
             ShowPassword = !ShowPassword;
@@ -431,8 +358,7 @@ namespace Bit.App.Pages
 
         public async Task PromptBiometricAsync()
         {
-            BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
-            BiometricButtonVisible = BiometricIntegrityValid;
+            BiometricIntegrityValid = await _biometricService.ValidateIntegrityAsync();
             if (!BiometricLock || !BiometricIntegrityValid)
             {
                 return;

src/App/Pages/Accounts/LoginPage.xaml

@@ -9,15 +9,16 @@
     xmlns:u="clr-namespace:Bit.App.Utilities"
     x:DataType="pages:LoginPageViewModel"
     x:Name="_page"
-    Title="{Binding PageTitle}"
-    AutomationId="PageTitleLabel">
+    Title="{Binding PageTitle}">
     
     <ContentPage.BindingContext>
         <pages:LoginPageViewModel />
     </ContentPage.BindingContext>
+
     <ContentPage.ToolbarItems>
         <controls:ExtendedToolbarItem
                 x:Name="_accountAvatar"
+                x:Key="accountAvatar"
                 IconImageSource="{Binding AvatarImageSource}"
                 Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
                 Order="Primary"
@@ -33,8 +34,7 @@
             <ToolbarItem Icon="more_vert.png" Clicked="More_Clicked" Order="Primary"
                 x:Name="_moreItem" x:Key="moreItem"
                  AutomationProperties.IsInAccessibleTree="True"
-                 AutomationProperties.Name="{u:I18n Options}"
-                 AutomationId="OptionsButton"/>
+                 AutomationProperties.Name="{u:I18n Options}" />
             <ToolbarItem Text="{u:I18n GetPasswordHint}"
                 x:Key="getPasswordHint"
                 x:Name="_getPasswordHint"
@@ -75,9 +75,7 @@
                                 Grid.Row="1"
                                 Grid.Column="0"
                                 ReturnType="Go"
-                                ReturnCommand="{Binding LogInCommand}"
-                                AutomationId="MasterPasswordEntry"
-                            />
+                                ReturnCommand="{Binding LogInCommand}" />
                             <controls:IconButton
                                 StyleClass="box-row-button, box-row-button-platform"
                                 Text="{Binding ShowPasswordIcon}"
@@ -86,7 +84,6 @@
                                 Grid.Column="1"
                                 Grid.RowSpan="1"
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationId="PasswordVisibilityToggle"
                                 AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                 AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
                             <Label
@@ -96,9 +93,7 @@
                                 Padding="0,5,0,0"
                                 Grid.Row="2"
                                 Grid.Column="0"
-                                Grid.ColumnSpan="2"
-                                AutomationId="GetMasterPasswordHintLabel"
-                                >
+                                Grid.ColumnSpan="2">
                                 <Label.GestureRecognizers>
                                     <TapGestureRecognizer Tapped="Hint_Clicked" />
                                 </Label.GestureRecognizers>
@@ -109,24 +104,19 @@
                         <Button x:Name="_loginWithMasterPassword"
                             Text="{u:I18n LogInWithMasterPassword}" 
                                 StyleClass="btn-primary"
-                                Clicked="LogIn_Clicked"
-                                AutomationId="LogInWithMasterPasswordButton"
-                                />
+                                Clicked="LogIn_Clicked" />
                         <controls:IconLabelButton
                             HorizontalOptions="Fill"
                             VerticalOptions="CenterAndExpand"
                             Icon="{Binding Source={x:Static core:BitwardenIcons.Device}}"
                             Label="{u:I18n LogInWithAnotherDevice}"
                             ButtonCommand="{Binding LogInWithDeviceCommand}"
-                            IsVisible="{Binding IsKnownDevice}"
-                            AutomationId="LogInWithAnotherDeviceButton"
-                            />
+                            IsVisible="{Binding IsKnownDevice}"/>
                         <controls:IconLabelButton
                             HorizontalOptions="Fill"
                             VerticalOptions="CenterAndExpand"
                             Icon="{Binding Source={x:Static core:BitwardenIcons.Suitcase}}"
-                            Label="{u:I18n LogInSso}"
-                            AutomationId="LogInWithSsoButton">
+                            Label="{u:I18n LogInSso}">
                             <controls:IconLabelButton.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="LogInSSO_Clicked" />
                             </controls:IconLabelButton.GestureRecognizers>
@@ -134,15 +124,12 @@
                         <Label
                             Text="{Binding LoggingInAsText}"
                             StyleClass="text-sm"
-                            Margin="0,40,0,0"
-                            AutomationId="LoggingInAsLabel"
-                            />
+                            Margin="0,40,0,0"/>
                         <Label
                             Text="{u:I18n NotYou}"
                             StyleClass="text-md"
                             HorizontalOptions="Start"
-                            TextColor="{DynamicResource HyperlinkColor}"
-                            AutomationId="NotYouLabel">
+                            TextColor="{DynamicResource HyperlinkColor}">
                             <Label.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="Cancel_Clicked" />
                             </Label.GestureRecognizers>

src/App/Pages/Accounts/LoginPage.xaml.cs

@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Utilities;
-using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
@@ -13,7 +12,6 @@ namespace Bit.App.Pages
 {
     public partial class LoginPage : BaseContentPage
     {
-        private readonly IBroadcasterService _broadcasterService;
         private readonly LoginPageViewModel _vm;
         private readonly AppOptions _appOptions;
 
@@ -25,7 +23,6 @@ namespace Bit.App.Pages
         {
             _appOptions = appOptions;
             InitializeComponent();
-            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>();
             _vm = BindingContext as LoginPageViewModel;
             _vm.Page = this;
             _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
@@ -73,13 +70,6 @@ namespace Bit.App.Pages
         protected override async void OnAppearing()
         {
             base.OnAppearing();
-            _broadcasterService.Subscribe(nameof(LoginPage), message =>
-            {
-                if (message.Command == Constants.ClearSensitiveFields)
-                {
-                    Device.BeginInvokeOnMainThread(_vm.ResetPasswordField);
-                }
-            });
             _mainContent.Content = _mainLayout;
             _accountAvatar?.OnAppearing();
 
@@ -114,7 +104,6 @@ namespace Bit.App.Pages
             base.OnDisappearing();
 
             _accountAvatar?.OnDisappearing();
-            _broadcasterService.Unsubscribe(nameof(LoginPage));
         }
 
         private async void LogIn_Clicked(object sender, EventArgs e)

src/App/Pages/Accounts/LoginPageViewModel.cs

@@ -40,8 +40,6 @@ namespace Bit.App.Pages
         private string _masterPassword;
         private bool _isEmailEnabled;
         private bool _isKnownDevice;
-        private bool _isExecutingLogin;
-        private string _environmentHostName;
 
         public LoginPageViewModel()
         {
@@ -116,16 +114,6 @@ namespace Bit.App.Pages
             set => SetProperty(ref _isKnownDevice, value);
         }
 
-        public string EnvironmentDomainName
-        {
-            get => _environmentHostName;
-            set => SetProperty(ref _environmentHostName, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(LoggingInAsText)
-                });
-        }
-
         public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
         public Command LogInCommand { get; }
         public Command TogglePasswordCommand { get; }
@@ -133,7 +121,7 @@ namespace Bit.App.Pages
         public ICommand LogInWithDeviceCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
-        public string LoggingInAsText => string.Format(AppResources.LoggingInAsXOnY, Email, EnvironmentDomainName);
+        public string LoggingInAsText => string.Format(AppResources.LoggingInAsX, Email);
         public bool IsIosExtension { get; set; }
         public bool CanRemoveAccount { get; set; }
         public Action StartTwoFactorAction { get; set; }
@@ -155,28 +143,20 @@ namespace Bit.App.Pages
             try
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                await _stateService.SetPreLoginEmailAsync(Email);
                 await AccountSwitchingOverlayViewModel.RefreshAccountViewsAsync();
                 if (string.IsNullOrWhiteSpace(Email))
                 {
                     Email = await _stateService.GetRememberedEmailAsync();
                 }
+                var deviceIdentifier = await _appIdService.GetAppIdAsync();
+                IsKnownDevice = await _apiService.GetKnownDeviceAsync(Email, deviceIdentifier);
                 CanRemoveAccount = await _stateService.GetActiveUserEmailAsync() != Email;
-                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)
-            {
-                _logger.Exception(apiEx);
+                await _deviceActionService.HideLoadingAsync();
             }
             catch (Exception ex)
             {
                 HandleException(ex);
             }
-            finally
-            {
-                await _deviceActionService.HideLoadingAsync();
-            }
         }
 
         public async Task LogInAsync(bool showLoading = true, bool checkForExistingAccount = false)
@@ -211,7 +191,6 @@ namespace Bit.App.Pages
             ShowPassword = false;
             try
             {
-                _isExecutingLogin = true;
                 if (checkForExistingAccount)
                 {
                     var userId = await _stateService.GetUserIdAsync(Email);
@@ -273,26 +252,6 @@ namespace Bit.App.Pages
                         AppResources.AnErrorHasOccurred, AppResources.Ok);
                 }
             }
-            finally
-            {
-                _isExecutingLogin = false;
-            }
-        }
-
-        public void ResetPasswordField()
-        {
-            try
-            {
-                if (!_isExecutingLogin)
-                {
-                    MasterPassword = string.Empty;
-                    ShowPassword = false;
-                }
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-            }
         }
 
         private async Task MoreAsync()

src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs

@@ -171,7 +171,7 @@ namespace Bit.App.Pages
             var response = await _authService.PasswordlessCreateLoginRequestAsync(_email);
             if (response != null)
             {
-                FingerprintPhrase = response.FingerprintPhrase;
+                FingerprintPhrase = response.RequestFingerprint;
                 _requestId = response.Id;
                 _requestAccessCode = response.RequestAccessCode;
                 _requestKeyPair = response.RequestKeyPair;

src/App/Pages/Accounts/LoginSsoPageViewModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Abstractions;
@@ -28,7 +27,6 @@ namespace Bit.App.Pages
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IStateService _stateService;
         private readonly ILogger _logger;
-        private readonly IOrganizationService _organizationService;
 
         private string _orgIdentifier;
 
@@ -44,7 +42,6 @@ namespace Bit.App.Pages
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _logger = ServiceContainer.Resolve<ILogger>("logger");
-            _organizationService = ServiceContainer.Resolve<IOrganizationService>();
 
 
             PageTitle = AppResources.Bitwarden;
@@ -66,25 +63,9 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            try
+            if (string.IsNullOrWhiteSpace(OrgIdentifier))
             {
-                if (await TryClaimedDomainLogin())
-                {
-                    return;
-                }
-
-                if (string.IsNullOrWhiteSpace(OrgIdentifier))
-                {
-                    OrgIdentifier = await _stateService.GetRememberedOrgIdentifierAsync();
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.Exception(ex);
-            }
-            finally
-            {
-                await _deviceActionService.HideLoadingAsync();
+                OrgIdentifier = await _stateService.GetRememberedOrgIdentifierAsync();
             }
         }
 
@@ -121,8 +102,9 @@ namespace Bit.App.Pages
 
                 var ssoToken = response.Token;
 
-                var passwordOptions = PasswordGenerationOptions.CreateDefault
-                                                               .WithLength(64);
+
+                var passwordOptions = new PasswordGenerationOptions(true);
+                passwordOptions.Length = 64;
 
                 var codeVerifier = await _passwordGenerationService.GeneratePasswordAsync(passwordOptions);
                 var codeVerifierHash = await _cryptoFunctionService.HashAsync(codeVerifier, CryptoHashAlgorithm.Sha256);
@@ -225,37 +207,5 @@ namespace Bit.App.Pages
                     AppResources.AnErrorHasOccurred);
             }
         }
-
-        private async Task<bool> TryClaimedDomainLogin()
-        {
-            try
-            {
-                await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                var userEmail = await _stateService.GetPreLoginEmailAsync();
-                var claimedDomainOrgDetails = await _organizationService.GetClaimedOrganizationDomainAsync(userEmail);
-                await _deviceActionService.HideLoadingAsync();
-
-                if (claimedDomainOrgDetails == null || !claimedDomainOrgDetails.SsoAvailable)
-                {
-                    return false;
-                }
-
-                if (string.IsNullOrEmpty(claimedDomainOrgDetails.OrganizationIdentifier))
-                {
-                    await _platformUtilsService.ShowDialogAsync(AppResources.OrganizationSsoIdentifierRequired, AppResources.AnErrorHasOccurred);
-                    return false;
-                }
-
-                OrgIdentifier = claimedDomainOrgDetails.OrganizationIdentifier;
-                await LogInAsync();
-                return true;
-            }
-            catch (Exception ex)
-            {
-                HandleException(ex);
-            }
-
-            return false;
-        }
     }
 }

src/App/Pages/Accounts/RegisterPage.xaml

@@ -35,8 +35,7 @@
                         x:Name="_email"
                         Text="{Binding Email}"
                         Keyboard="Email"
-                        StyleClass="box-value"
-                        AutomationId="EmailAddressEntry"/>
+                        StyleClass="box-value" />
                 </StackLayout>
                 <Grid StyleClass="box-row">
                     <Grid.RowDefinitions>
@@ -60,8 +59,7 @@
                         IsTextPredictionEnabled="False"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="MasterPasswordEntry"/>
+                        Grid.Column="0" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -71,8 +69,7 @@
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}" 
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="PasswordVisibilityToggle"/>
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
                 </Grid>
                 <Label
                     StyleClass="box-sub-label"
@@ -112,8 +109,7 @@
                         IsTextPredictionEnabled="False"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="ConfirmMasterPasswordEntry"/>
+                        Grid.Column="0" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -122,7 +118,6 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationId="ConfirmPasswordVisibilityToggle"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
                         AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                 </Grid>
@@ -135,8 +130,7 @@
                         Text="{Binding Hint}"
                         StyleClass="box-value"
                         ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="MasterPasswordHintLabel" />
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n MasterPasswordHintDescription}"
@@ -148,8 +142,7 @@
                         IsToggled="{Binding CheckExposedMasterPassword}"
                         StyleClass="box-value"
                         HorizontalOptions="Start"
-                        Margin="0, 0, 10, 0"
-                        AutomationId="CheckExposedMasterPasswordToggle"/>
+                        Margin="0, 0, 10, 0"/>
                     <Label
                         Text="{u:I18n CheckKnownDataBreachesForThisPassword}"
                         StyleClass="box-footer-label"
@@ -161,8 +154,7 @@
                         IsToggled="{Binding AcceptPolicies}"
                         StyleClass="box-value"
                         HorizontalOptions="Start"
-                        Margin="0, 0, 10, 0"
-                        AutomationId="AcceptPoliciesToggle"/>
+                        Margin="0, 0, 10, 0"/>
                     <Label StyleClass="box-footer-label"
                            HorizontalOptions="Fill">
                         <Label.FormattedText>

src/App/Pages/Accounts/RegisterPageViewModel.cs

@@ -148,7 +148,7 @@ namespace Bit.App.Pages
             }
             if (MasterPassword.Length < Constants.MasterPasswordMinimumChars)
             {
-                await _platformUtilsService.ShowDialogAsync(string.Format(AppResources.MasterPasswordLengthValMessageX, Constants.MasterPasswordMinimumChars),
+                await _platformUtilsService.ShowDialogAsync(AppResources.MasterPasswordLengthValMessage,
                     AppResources.AnErrorHasOccurred, AppResources.Ok);
                 return;
             }

src/App/Pages/Accounts/SetPasswordPageViewModel.cs

@@ -152,7 +152,7 @@ namespace Bit.App.Pages
                 if (MasterPassword.Length < Constants.MasterPasswordMinimumChars)
                 {
                     await Page.DisplayAlert(AppResources.MasterPasswordPolicyValidationTitle,
-                        string.Format(AppResources.MasterPasswordLengthValMessageX, Constants.MasterPasswordMinimumChars), AppResources.Ok);
+                        AppResources.MasterPasswordLengthValMessage, AppResources.Ok);
                     return;
                 }
             }

src/App/Pages/Accounts/UpdateTempPasswordPage.xaml

@@ -46,7 +46,7 @@
                            BackgroundColor="Transparent"
                            BorderColor="{DynamicResource PrimaryColor}">
                         <Label
-                            Text="{Binding UpdateMasterPasswordWarningText }"
+                            Text="{u:I18n UpdateMasterPasswordWarning}"
                             StyleClass="text-muted, text-sm, text-bold"
                             HorizontalTextAlignment="Center" />
                     </Frame>
@@ -74,40 +74,6 @@
                             HorizontalTextAlignment="Start" />
                     </Frame>
                 </Grid>
-                <Grid StyleClass="box-row" IsVisible="{Binding RequireCurrentPassword }">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Label
-                        Text="{u:I18n CurrentMasterPassword}"
-                        StyleClass="box-label" 
-                        Grid.Row="0"
-                        Grid.Column="0" />
-                    <controls:MonoEntry
-                        x:Name="_currentMasterPassword"
-                        Text="{Binding CurrentMasterPassword}"
-                        StyleClass="box-value"
-                        IsSpellCheckEnabled="False"
-                        IsTextPredictionEnabled="False"
-                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                        Grid.Row="1"
-                        Grid.Column="0" />
-                    <controls:IconButton
-                        StyleClass="box-row-button, box-row-button-platform"
-                        Text="{Binding ShowPasswordIcon}"
-                        Command="{Binding TogglePasswordCommand}"
-                        Grid.Row="0"
-                        Grid.Column="1"
-                        Grid.RowSpan="2"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
-                </Grid>
                 <Grid StyleClass="box-row">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />

src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs

@@ -1,68 +1,27 @@
 using System;
 using System.Threading.Tasks;
 using Bit.App.Resources;
-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.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
     public class UpdateTempPasswordPageViewModel : BaseChangePasswordViewModel
     {
-        private readonly IUserVerificationService _userVerificationService;
-
-        private ForcePasswordResetReason _reason = ForcePasswordResetReason.AdminForcePasswordReset;
-
         public UpdateTempPasswordPageViewModel()
         {
             PageTitle = AppResources.UpdateMasterPassword;
             TogglePasswordCommand = new Command(TogglePassword);
             ToggleConfirmPasswordCommand = new Command(ToggleConfirmPassword);
-            SubmitCommand = new AsyncCommand(SubmitAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
+            SubmitCommand = new Command(async () => await SubmitAsync());
         }
 
-        public AsyncCommand SubmitCommand { get; }
+        public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
         public Command ToggleConfirmPasswordCommand { get; }
         public Action UpdateTempPasswordSuccessAction { get; set; }
         public Action LogOutAction { get; set; }
-        public string CurrentMasterPassword { get; set; }
-
-        public override async Task InitAsync(bool forceSync = false)
-        {
-            await base.InitAsync(forceSync);
-
-            var forcePasswordResetReason = await _stateService.GetForcePasswordResetReasonAsync();
-
-            if (forcePasswordResetReason.HasValue)
-            {
-                _reason = forcePasswordResetReason.Value;
-            }
-        }
-
-        public bool RequireCurrentPassword
-        {
-            get => _reason == ForcePasswordResetReason.WeakMasterPasswordOnLogin;
-        }
-
-        public string UpdateMasterPasswordWarningText
-        {
-            get
-            {
-                return _reason == ForcePasswordResetReason.WeakMasterPasswordOnLogin
-                    ? AppResources.UpdateWeakMasterPasswordWarning
-                    : AppResources.UpdateMasterPasswordWarning;
-            }
-        }
 
         public void TogglePassword()
         {
@@ -83,12 +42,6 @@ namespace Bit.App.Pages
                 return;
             }
 
-            if (RequireCurrentPassword &&
-                !await _userVerificationService.VerifyUser(CurrentMasterPassword, VerificationType.MasterPassword))
-            {
-                return;
-            }
-
             // Retrieve details for key generation
             var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
             var email = await _stateService.GetEmailAsync();
@@ -100,29 +53,21 @@ namespace Bit.App.Pages
             // Create new encKey for the User
             var newEncKey = await _cryptoService.RemakeEncKeyAsync(key);
 
+            // Create request
+            var request = new UpdateTempPasswordRequest
+            {
+                Key = newEncKey.Item2.EncryptedString,
+                NewMasterPasswordHash = masterPasswordHash,
+                MasterPasswordHint = Hint
+            };
+
             // Initiate API action
             try
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.UpdatingPassword);
-
-                switch (_reason)
-                {
-                    case ForcePasswordResetReason.AdminForcePasswordReset:
-                        await UpdateTempPasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
-                        break;
-                    case ForcePasswordResetReason.WeakMasterPasswordOnLogin:
-                        await UpdatePasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
+                await _apiService.PutUpdateTempPasswordAsync(request);
                 await _deviceActionService.HideLoadingAsync();
 
-                // Clear the force reset password reason
-                await _stateService.SetForcePasswordResetReasonAsync(null);
-
-                _platformUtilsService.ShowToast(null, null, AppResources.UpdatedMasterPassword);
-
                 UpdateTempPasswordSuccessAction?.Invoke();
             }
             catch (ApiException e)
@@ -140,32 +85,5 @@ namespace Bit.App.Pages
                 }
             }
         }
-
-        private async Task UpdateTempPasswordAsync(string newMasterPasswordHash, string newEncKey)
-        {
-            var request = new UpdateTempPasswordRequest
-            {
-                Key = newEncKey,
-                NewMasterPasswordHash = newMasterPasswordHash,
-                MasterPasswordHint = Hint
-            };
-
-            await _apiService.PutUpdateTempPasswordAsync(request);
-        }
-
-        private async Task UpdatePasswordAsync(string newMasterPasswordHash, string newEncKey)
-        {
-            var currentPasswordHash = await _cryptoService.HashPasswordAsync(CurrentMasterPassword, null);
-
-            var request = new PasswordRequest
-            {
-                MasterPasswordHash = currentPasswordHash,
-                Key = newEncKey,
-                NewMasterPasswordHash = newMasterPasswordHash,
-                MasterPasswordHint = Hint
-            };
-
-            await _apiService.PostPasswordAsync(request);
-        }
     }
 }

src/App/Pages/Generator/GeneratorPageViewModel.cs

@@ -827,7 +827,7 @@ namespace Bit.App.Pages
         private void SetOptions()
         {
             _options.AllowAmbiguousChar = AllowAmbiguousChars;
-            _options.Type = PasswordTypeSelectedIndex == 1 ? PasswordGenerationOptions.TYPE_PASSPHRASE : PasswordGenerationOptions.TYPE_PASSWORD;
+            _options.Type = PasswordTypeSelectedIndex == 1 ? "passphrase" : "password";
             _options.MinNumber = MinNumber;
             _options.MinSpecial = MinSpecial;
             _options.Special = Special;

src/App/Pages/Settings/LoginPasswordlessRequestsListPage.xaml

@@ -39,7 +39,7 @@
                             Padding="0, 10, 0 ,0"
                             FontAttributes="Bold"/>
                         <controls:MonoLabel
-                            FormattedText="{Binding FingerprintPhrase}"
+                            FormattedText="{Binding RequestFingerprint}"
                             Grid.Row="1"
                             Grid.ColumnSpan="2"
                             FontSize="Small"

src/App/Pages/Settings/LoginPasswordlessRequestsListViewModel.cs

@@ -99,7 +99,7 @@ namespace Bit.App.Pages
                 Id = loginRequestData.Id,
                 IpAddress = loginRequestData.RequestIpAddress,
                 Email = await _stateService.GetEmailAsync(),
-                FingerprintPhrase = loginRequestData.FingerprintPhrase,
+                FingerprintPhrase = loginRequestData.RequestFingerprint,
                 RequestDate = loginRequestData.CreationDate,
                 DeviceType = loginRequestData.RequestDeviceType,
                 Origin = loginRequestData.Origin

src/App/Pages/Settings/OptionsPage.xaml

@@ -80,22 +80,6 @@
                     Text="{u:I18n ClearClipboardDescription}"
                     StyleClass="box-footer-label" />
             </StackLayout>
-            <StackLayout StyleClass="box">
-                <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
-                    <Label
-                        Text="{u:I18n Language}"
-                        StyleClass="box-label" />
-                    <Picker
-                        x:Name="_languagePicker"
-                        ItemsSource="{Binding LocalesOptions, Mode=OneTime}"
-                        SelectedItem="{Binding SelectedLocale}"
-                        ItemDisplayBinding="{Binding Value}"
-                        StyleClass="box-value" />
-                </StackLayout>
-                <Label
-                    Text="{u:I18n LanguageChangeRequiresAppRestart}"
-                    StyleClass="box-footer-label" />
-            </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row, box-row-switch">
                     <Label

src/App/Pages/Settings/OptionsPage.xaml.cs

@@ -34,7 +34,6 @@ namespace Bit.App.Pages
                 _autoDarkThemePicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
                 _uriMatchPicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
                 _clearClipboardPicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
-                _languagePicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
             }
         }
 

src/App/Pages/Settings/OptionsPageViewModel.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Bit.App.Resources;
 using Bit.App.Utilities;
@@ -15,8 +14,7 @@ namespace Bit.App.Pages
     {
         private readonly IStateService _stateService;
         private readonly IMessagingService _messagingService;
-        private readonly II18nService _i18nService;
-        private readonly IPlatformUtilsService _platformUtilsService;
+
 
         private bool _autofillSavePrompt;
         private string _autofillBlockedUris;
@@ -26,7 +24,6 @@ namespace Bit.App.Pages
         private int _themeSelectedIndex;
         private int _autoDarkThemeSelectedIndex;
         private int _uriMatchSelectedIndex;
-        private KeyValuePair<string, string> _selectedLocale;
         private bool _inited;
         private bool _updatingAutofill;
         private bool _showAndroidAutofillSettings;
@@ -35,8 +32,6 @@ namespace Bit.App.Pages
         {
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _i18nService = ServiceContainer.Resolve<II18nService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
 
             PageTitle = AppResources.Options;
             var iosIos = Device.RuntimePlatform == Device.iOS;
@@ -79,18 +74,12 @@ namespace Bit.App.Pages
                 new KeyValuePair<UriMatchType?, string>(UriMatchType.Exact, AppResources.Exact),
                 new KeyValuePair<UriMatchType?, string>(UriMatchType.Never, AppResources.Never),
             };
-            LocalesOptions = new List<KeyValuePair<string, string>>
-            {
-                new KeyValuePair<string, string>(null, AppResources.DefaultSystem)
-            };
-            LocalesOptions.AddRange(_i18nService.LocaleNames.ToList());
         }
 
         public List<KeyValuePair<int?, string>> ClearClipboardOptions { get; set; }
         public List<KeyValuePair<string, string>> ThemeOptions { get; set; }
         public List<KeyValuePair<string, string>> AutoDarkThemeOptions { get; set; }
         public List<KeyValuePair<UriMatchType?, string>> UriMatchOptions { get; set; }
-        public List<KeyValuePair<string, string>> LocalesOptions { get; }
 
         public int ClearClipboardSelectedIndex
         {
@@ -144,18 +133,6 @@ namespace Bit.App.Pages
             }
         }
 
-        public KeyValuePair<string, string> SelectedLocale
-        {
-            get => _selectedLocale;
-            set
-            {
-                if (SetProperty(ref _selectedLocale, value))
-                {
-                    UpdateCurrentLocaleAsync().FireAndForget();
-                }
-            }
-        }
-
         public bool Favicon
         {
             get => _favicon;
@@ -207,30 +184,19 @@ namespace Bit.App.Pages
         public async Task InitAsync()
         {
             AutofillSavePrompt = !(await _stateService.GetAutofillDisableSavePromptAsync()).GetValueOrDefault();
-
             var blockedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
             AutofillBlockedUris = blockedUrisList != null ? string.Join(", ", blockedUrisList) : null;
-
             AutoTotpCopy = !(await _stateService.GetDisableAutoTotpCopyAsync() ?? false);
-
             Favicon = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
-
             var theme = await _stateService.GetThemeAsync();
             ThemeSelectedIndex = ThemeOptions.FindIndex(k => k.Key == theme);
-
             var autoDarkTheme = await _stateService.GetAutoDarkThemeAsync() ?? "dark";
             AutoDarkThemeSelectedIndex = AutoDarkThemeOptions.FindIndex(k => k.Key == autoDarkTheme);
-
             var defaultUriMatch = await _stateService.GetDefaultUriMatchAsync();
             UriMatchSelectedIndex = defaultUriMatch == null ? 0 :
                 UriMatchOptions.FindIndex(k => (int?)k.Key == defaultUriMatch);
-
             var clearClipboard = await _stateService.GetClearClipboardAsync();
             ClearClipboardSelectedIndex = ClearClipboardOptions.FindIndex(k => k.Key == clearClipboard);
-
-            var appLocale = _stateService.GetLocale();
-            SelectedLocale = appLocale == null ? LocalesOptions.First() : LocalesOptions.FirstOrDefault(kv => kv.Key == appLocale);
-
             _inited = true;
         }
 
@@ -322,17 +288,5 @@ namespace Bit.App.Pages
                 catch { }
             }
         }
-
-        private async Task UpdateCurrentLocaleAsync()
-        {
-            if (!_inited)
-            {
-                return;
-            }
-
-            _stateService.SetLocale(SelectedLocale.Key);
-
-            await _platformUtilsService.ShowDialogAsync(string.Format(AppResources.LanguageChangeXDescription, SelectedLocale.Value), AppResources.Language, AppResources.Ok);
-        }
     }
 }

src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs

@@ -7,7 +7,10 @@ using Bit.App.Pages.Accounts;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Models;
 using Bit.Core.Models.Domain;
+using Bit.Core.Models.Response;
+using Bit.Core.Models.View;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -48,7 +51,7 @@ namespace Bit.App.Pages
         private bool _reportLoggingEnabled;
         private bool _approvePasswordlessLoginRequests;
         private bool _shouldConnectToWatch;
-        private readonly static List<KeyValuePair<string, int?>> VaultTimeoutOptions =
+        private List<KeyValuePair<string, int?>> _vaultTimeouts =
             new List<KeyValuePair<string, int?>>
             {
                 new KeyValuePair<string, int?>(AppResources.Immediately, 0),
@@ -62,7 +65,7 @@ namespace Bit.App.Pages
                 new KeyValuePair<string, int?>(AppResources.Never, null),
                 new KeyValuePair<string, int?>(AppResources.Custom, CustomVaultTimeoutValue),
             };
-        private readonly static List<KeyValuePair<string, VaultTimeoutAction>> VaultTimeoutActionOptions =
+        private List<KeyValuePair<string, VaultTimeoutAction>> _vaultTimeoutActions =
             new List<KeyValuePair<string, VaultTimeoutAction>>
             {
                 new KeyValuePair<string, VaultTimeoutAction>(AppResources.Lock, VaultTimeoutAction.Lock),
@@ -71,8 +74,6 @@ namespace Bit.App.Pages
 
         private Policy _vaultTimeoutPolicy;
         private int? _vaultTimeout;
-        private List<KeyValuePair<string, int?>> _vaultTimeoutOptions = VaultTimeoutOptions;
-        private List<KeyValuePair<string, VaultTimeoutAction>> _vaultTimeoutActionOptions = VaultTimeoutActionOptions;
 
         public SettingsPageViewModel()
         {
@@ -116,28 +117,20 @@ namespace Bit.App.Pages
                     _localizeService.GetLocaleShortTime(lastSync.Value));
             }
 
-            _vaultTimeoutPolicy = null;
-            _vaultTimeoutOptions = VaultTimeoutOptions;
-            _vaultTimeoutActionOptions = VaultTimeoutActionOptions;
-
-            _vaultTimeout = await _vaultTimeoutService.GetVaultTimeout();
-            _vaultTimeoutDisplayValue = _vaultTimeoutOptions.FirstOrDefault(o => o.Value == _vaultTimeout).Key;
-            _vaultTimeoutDisplayValue ??= _vaultTimeoutOptions.Where(o => o.Value == CustomVaultTimeoutValue).First().Key;
-
-            var action = await _vaultTimeoutService.GetVaultTimeoutAction() ?? VaultTimeoutAction.Lock;
-            _vaultTimeoutActionDisplayValue = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Value == action).Key;
-
             if (await _policyService.PolicyAppliesToUser(PolicyType.MaximumVaultTimeout))
             {
-                // if we have a vault timeout policy, we need to filter the timeout options
                 _vaultTimeoutPolicy = (await _policyService.GetAll(PolicyType.MaximumVaultTimeout)).First();
-                var policyMinutes = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
-                _vaultTimeoutOptions = _vaultTimeoutOptions.Where(t =>
-                    t.Value <= policyMinutes &&
+                var minutes = _policyService.GetPolicyInt(_vaultTimeoutPolicy, "minutes").GetValueOrDefault();
+                _vaultTimeouts = _vaultTimeouts.Where(t =>
+                    t.Value <= minutes &&
                     (t.Value > 0 || t.Value == CustomVaultTimeoutValue) &&
                     t.Value != null).ToList();
             }
 
+            _vaultTimeout = await _vaultTimeoutService.GetVaultTimeout();
+            _vaultTimeoutDisplayValue = _vaultTimeouts.FirstOrDefault(o => o.Value == _vaultTimeout).Key;
+            var action = await _stateService.GetVaultTimeoutActionAsync() ?? VaultTimeoutAction.Lock;
+            _vaultTimeoutActionDisplayValue = _vaultTimeoutActions.FirstOrDefault(o => o.Value == action).Key;
             var pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
             _pin = pinSet.Item1 || pinSet.Item2;
             _biometric = await _vaultTimeoutService.IsBiometricLockSetAsync();
@@ -273,7 +266,7 @@ namespace Bit.App.Pages
         {
             var oldTimeout = _vaultTimeout;
 
-            var options = _vaultTimeoutOptions.Select(
+            var options = _vaultTimeouts.Select(
                 o => o.Key == _vaultTimeoutDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
             if (promptOptions)
             {
@@ -284,7 +277,7 @@ namespace Bit.App.Pages
                     return;
                 }
                 var cleanSelection = selection.Replace("✓ ", string.Empty);
-                var selectionOption = _vaultTimeoutOptions.FirstOrDefault(o => o.Key == cleanSelection);
+                var selectionOption = _vaultTimeouts.FirstOrDefault(o => o.Key == cleanSelection);
 
                 // Check if the selected Timeout action is "Never" and if it's different from the previous selected value
                 if (selectionOption.Value == null && selectionOption.Value != oldTimeout)
@@ -302,13 +295,13 @@ namespace Bit.App.Pages
 
             if (_vaultTimeoutPolicy != null)
             {
-                var maximumTimeout = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
+                var maximumTimeout = _policyService.GetPolicyInt(_vaultTimeoutPolicy, "minutes");
 
                 if (newTimeout > maximumTimeout)
                 {
                     await _platformUtilsService.ShowDialogAsync(AppResources.VaultTimeoutToLarge, AppResources.Warning);
                     var timeout = await _vaultTimeoutService.GetVaultTimeout();
-                    _vaultTimeoutDisplayValue = _vaultTimeoutOptions.FirstOrDefault(o => o.Value == timeout).Key ??
+                    _vaultTimeoutDisplayValue = _vaultTimeouts.FirstOrDefault(o => o.Value == timeout).Key ??
                                                 AppResources.Custom;
                     return;
                 }
@@ -381,13 +374,7 @@ namespace Bit.App.Pages
 
         public async Task VaultTimeoutActionAsync()
         {
-            if (_vaultTimeoutPolicy != null &&
-                !string.IsNullOrEmpty(_vaultTimeoutPolicy.GetString(Policy.ACTION_KEY)))
-            {
-                // do nothing if we have a policy set
-                return;
-            }
-            var options = _vaultTimeoutActionOptions.Select(o =>
+            var options = _vaultTimeoutActions.Select(o =>
                 o.Key == _vaultTimeoutActionDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
             var selection = await Page.DisplayActionSheet(AppResources.VaultTimeoutAction,
                 AppResources.Cancel, null, options);
@@ -406,7 +393,7 @@ namespace Bit.App.Pages
                     cleanSelection = AppResources.Lock;
                 }
             }
-            var selectionOption = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Key == cleanSelection);
+            var selectionOption = _vaultTimeoutActions.FirstOrDefault(o => o.Key == cleanSelection);
             var changed = _vaultTimeoutActionDisplayValue != selectionOption.Key;
             _vaultTimeoutActionDisplayValue = selectionOption.Key;
             await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(_vaultTimeout,
@@ -610,36 +597,14 @@ namespace Bit.App.Pages
             }
             if (_vaultTimeoutPolicy != null)
             {
-                var policyMinutes = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
-                var policyAction = _vaultTimeoutPolicy.GetString(Policy.ACTION_KEY);
-
-                if (policyMinutes.HasValue || !string.IsNullOrWhiteSpace(policyAction))
+                var maximumTimeout = _policyService.GetPolicyInt(_vaultTimeoutPolicy, "minutes").GetValueOrDefault();
+                securityItems.Insert(0, new SettingsPageListItem
                 {
-                    string policyAlert;
-                    if (policyMinutes.HasValue && string.IsNullOrWhiteSpace(policyAction))
-                    {
-                        policyAlert = string.Format(AppResources.VaultTimeoutPolicyInEffect,
-                            Math.Floor((float)policyMinutes / 60),
-                            policyMinutes % 60);
-                    }
-                    else if (!policyMinutes.HasValue && !string.IsNullOrWhiteSpace(policyAction))
-                    {
-                        policyAlert = string.Format(AppResources.VaultTimeoutActionPolicyInEffect,
-                            policyAction == Policy.ACTION_LOCK ? AppResources.Lock : AppResources.LogOut);
-                    }
-                    else
-                    {
-                        policyAlert = string.Format(AppResources.VaultTimeoutPolicyWithActionInEffect,
-                            Math.Floor((float)policyMinutes / 60),
-                            policyMinutes % 60,
-                            policyAction == Policy.ACTION_LOCK ? AppResources.Lock : AppResources.LogOut);
-                    }
-                    securityItems.Insert(0, new SettingsPageListItem
-                    {
-                        Name = policyAlert,
-                        UseFrame = true,
-                    });
-                }
+                    Name = string.Format(AppResources.VaultTimeoutPolicyInEffect,
+                        Math.Floor((float)maximumTimeout / 60),
+                        maximumTimeout % 60),
+                    UseFrame = true,
+                });
             }
             if (Device.RuntimePlatform == Device.Android)
             {
@@ -827,12 +792,12 @@ namespace Bit.App.Pages
 
         private VaultTimeoutAction GetVaultTimeoutActionFromKey(string key)
         {
-            return _vaultTimeoutActionOptions.FirstOrDefault(o => o.Key == key).Value;
+            return _vaultTimeoutActions.FirstOrDefault(o => o.Key == key).Value;
         }
 
         private int? GetVaultTimeoutFromKey(string key)
         {
-            return _vaultTimeoutOptions.FirstOrDefault(o => o.Key == key).Value;
+            return _vaultTimeouts.FirstOrDefault(o => o.Key == key).Value;
         }
 
         private string CreateSelectableOption(string option, bool selected) => selected ? $"✓ {option}" : option;
@@ -841,6 +806,11 @@ namespace Bit.App.Pages
 
         public async Task SetScreenCaptureAllowedAsync()
         {
+            if (CoreHelpers.ForceScreenCaptureEnabled())
+            {
+                return;
+            }
+
             try
             {
                 if (!_screenCaptureAllowed

src/App/Pages/TabsPage.cs

@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using Bit.App.Effects;
 using Bit.App.Models;
 using Bit.App.Resources;
-using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
@@ -16,7 +15,6 @@ namespace Bit.App.Pages
         private readonly IBroadcasterService _broadcasterService;
         private readonly IMessagingService _messagingService;
         private readonly IKeyConnectorService _keyConnectorService;
-        private readonly IStateService _stateService;
         private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
         private NavigationPage _groupingsPage;
@@ -28,7 +26,6 @@ namespace Bit.App.Pages
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
-            _stateService = ServiceContainer.Resolve<IStateService>();
 
             _groupingsPage = new NavigationPage(new GroupingsPage(true, previousPage: previousPage))
             {
@@ -98,13 +95,6 @@ namespace Bit.App.Pages
             {
                 _messagingService.Send("convertAccountToKeyConnector");
             }
-
-            var forcePasswordResetReason = await _stateService.GetForcePasswordResetReasonAsync();
-
-            if (forcePasswordResetReason.HasValue)
-            {
-                _messagingService.Send(Constants.ForceUpdatePassword);
-            }
         }
 
         protected override void OnDisappearing()

src/App/Pages/Vault/AttachmentsPageViewModel.cs

@@ -156,7 +156,7 @@ namespace Bit.App.Pages
             // Prevent Android from locking if vault timeout set to "immediate"
             if (Device.RuntimePlatform == Device.Android)
             {
-                _vaultTimeoutService.DelayTimeoutMs = 60000;
+                _vaultTimeoutService.DelayLockAndLogoutMs = 60000;
             }
             await _fileService.SelectFileAsync();
         }

src/App/Pages/Vault/AutofillCiphersPage.xaml

@@ -1,15 +1,19 @@
 <?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:xct="http://xamarin.com/schemas/2020/toolkit"
-             x:Class="Bit.App.Pages.CipherSelectionPage"
+             x:Class="Bit.App.Pages.AutofillCiphersPage"
              xmlns:pages="clr-namespace:Bit.App.Pages"
              xmlns:u="clr-namespace:Bit.App.Utilities"
              xmlns:controls="clr-namespace:Bit.App.Controls"
              xmlns:effects="clr-namespace:Bit.App.Effects;assembly=BitwardenApp"
-             x:DataType="pages:CipherSelectionPageViewModel"
+             x:DataType="pages:AutofillCiphersPageViewModel"
              Title="{Binding PageTitle}"
              x:Name="_page">
+
+    <ContentPage.BindingContext>
+        <pages:AutofillCiphersPageViewModel />
+    </ContentPage.BindingContext>
+
     <ContentPage.ToolbarItems>
         <controls:ExtendedToolbarItem
             x:Name="_accountAvatar"
@@ -20,7 +24,7 @@
             UseOriginalImage="True"
             AutomationProperties.IsInAccessibleTree="True"
             AutomationProperties.Name="{u:I18n Account}" />
-        <ToolbarItem IconImageSource="search.png" Clicked="Search_Clicked"
+        <ToolbarItem Icon="search.png" Clicked="Search_Clicked"
                      AutomationProperties.IsInAccessibleTree="True"
                      AutomationProperties.Name="{u:I18n Search}" />
     </ContentPage.ToolbarItems>
@@ -28,21 +32,6 @@
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
-            <controls:SelectionChangedEventArgsConverter x:Key="SelectionChangedEventArgsConverter" />
-                        
-            <ToolbarItem
-                x:Name="_closeItem"
-                x:Key="_closeItem"
-                Text="{u:I18n Close}"
-                Clicked="CloseItem_Clicked"
-                Order="Primary"
-                Priority="-1" />
-            <ToolbarItem x:Name="_addItem" x:Key="addItem"
-                         IconImageSource="plus.png"
-                         Command="{Binding AddCipherCommand}"
-                         Order="Primary"
-                         AutomationProperties.IsInAccessibleTree="True"
-                         AutomationProperties.Name="{u:I18n AddItem}" />
 
             <DataTemplate x:Key="cipherTemplate"
                           x:DataType="pages:GroupingsPageListItem">
@@ -81,44 +70,23 @@
                     Padding="20, 0"
                     Spacing="20"
                     IsVisible="{Binding ShowNoData}">
-                    <Image
-                        Source="empty_items_state" />
                     <Label
                         Text="{Binding NoDataText}"
                         HorizontalTextAlignment="Center"></Label>
                     <Button
                         Text="{u:I18n AddAnItem}"
-                        Command="{Binding AddCipherCommand}" />
+                        Clicked="AddButton_Clicked"></Button>
                 </StackLayout>
 
-                <Frame
-                    IsVisible="{Binding ShowCallout}"
-                    Padding="10"
-                    Margin="20, 10"
-                    HasShadow="False"
-                    BackgroundColor="Transparent"
-                    BorderColor="{DynamicResource PrimaryColor}">
-                    <Label
-                        Text="{u:I18n AddTheKeyToAnExistingOrNewItem}"
-                        StyleClass="text-muted, text-sm, text-bold"
-                        HorizontalTextAlignment="Center" />
-                </Frame>
-
                 <controls:ExtendedCollectionView
                     IsVisible="{Binding ShowList}"
                     ItemsSource="{Binding GroupedItems}"
                     VerticalOptions="FillAndExpand"
                     ItemTemplate="{StaticResource listItemDataTemplateSelector}"
                     SelectionMode="Single"
+                    SelectionChanged="RowSelected"
                     StyleClass="list, list-platform"
-                    ExtraDataForLogging="Autofill Ciphers Page">
-                    <controls:ExtendedCollectionView.Behaviors>
-                        <xct:EventToCommandBehavior
-                            EventName="SelectionChanged"
-                            Command="{Binding SelectCipherCommand}"
-                            EventArgsConverter="{StaticResource SelectionChangedEventArgsConverter}" />
-                    </controls:ExtendedCollectionView.Behaviors>
-                </controls:ExtendedCollectionView>
+                    ExtraDataForLogging="Autofill Ciphers Page" />
             </StackLayout>
         </ResourceDictionary>
     </ContentPage.Resources>
@@ -136,10 +104,9 @@
         <!-- Android FAB -->
         <Button
             x:Name="_fab"
-            ImageSource="plus.png"
-            Command="{Binding AddCipherCommand}"
+            Image="plus.png"
+            Clicked="AddButton_Clicked"
             Style="{StaticResource btn-fab}"
-            IsVisible="{OnPlatform iOS=false, Android=true}"
             AbsoluteLayout.LayoutFlags="PositionProportional"
             AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize">
             <Button.Effects>

src/App/Pages/Vault/AutofillCiphersPage.xaml.cs

@@ -1,6 +1,7 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Controls;
 using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
@@ -11,46 +12,27 @@ using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
-    public partial class CipherSelectionPage : BaseContentPage
+    public partial class AutofillCiphersPage : BaseContentPage
     {
         private readonly AppOptions _appOptions;
         private readonly IBroadcasterService _broadcasterService;
         private readonly ISyncService _syncService;
         private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly IAccountsManager _accountsManager;
 
-        private readonly CipherSelectionPageViewModel _vm;
+        private AutofillCiphersPageViewModel _vm;
 
-        public CipherSelectionPage(AppOptions appOptions)
+        public AutofillCiphersPage(AppOptions appOptions)
         {
             _appOptions = appOptions;
-
-            if (appOptions?.OtpData is null)
-            {
-                BindingContext = new AutofillCiphersPageViewModel();
-            }
-            else
-            {
-                BindingContext = new OTPCipherSelectionPageViewModel();
-            }
-
             InitializeComponent();
-
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                ToolbarItems.Add(_closeItem);
-                ToolbarItems.Add(_addItem);
-            }
-
             SetActivityIndicator(_mainContent);
-            _vm = BindingContext as CipherSelectionPageViewModel;
+            _vm = BindingContext as AutofillCiphersPageViewModel;
             _vm.Page = this;
             _vm.Init(appOptions);
 
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
             _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            _accountsManager = ServiceContainer.Resolve<IAccountsManager>();
         }
 
         protected async override void OnAppearing()
@@ -69,18 +51,10 @@ namespace Bit.App.Pages
                 return;
             }
 
-            try
-            {
-                // don't crash the app if the avatar can't be loaded, just log the ex
-                _accountAvatar?.OnAppearing();
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-            }
+            _accountAvatar?.OnAppearing();
+            _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
 
-            _broadcasterService.Subscribe(nameof(CipherSelectionPage), async (message) =>
+            _broadcasterService.Subscribe(nameof(AutofillCiphersPage), async (message) =>
             {
                 try
                 {
@@ -142,44 +116,40 @@ namespace Bit.App.Pages
             _accountAvatar?.OnDisappearing();
         }
 
-        private void AddButton_Clicked(object sender, System.EventArgs e)
+        private async void RowSelected(object sender, SelectionChangedEventArgs e)
+        {
+            ((ExtendedCollectionView)sender).SelectedItem = null;
+            if (!DoOnce())
+            {
+                return;
+            }
+            if (e.CurrentSelection?.FirstOrDefault() is GroupingsPageListItem item && item.Cipher != null)
+            {
+                await _vm.SelectCipherAsync(item.Cipher, item.FuzzyAutofill);
+            }
+        }
+
+        private async void AddButton_Clicked(object sender, System.EventArgs e)
         {
             if (!DoOnce())
             {
                 return;
             }
-
-            if (_vm is AutofillCiphersPageViewModel autofillVM)
-            {
-                AddFromAutofill(autofillVM).FireAndForget();
-            }
-        }
-
-        private async Task AddFromAutofill(AutofillCiphersPageViewModel autofillVM)
-        {
             if (_appOptions.FillType.HasValue && _appOptions.FillType != CipherType.Login)
             {
                 var pageForOther = new CipherAddEditPage(type: _appOptions.FillType, fromAutofill: true);
                 await Navigation.PushModalAsync(new NavigationPage(pageForOther));
                 return;
             }
-            var pageForLogin = new CipherAddEditPage(null, CipherType.Login, uri: autofillVM.Uri, name: _vm.Name,
+            var pageForLogin = new CipherAddEditPage(null, CipherType.Login, uri: _vm.Uri, name: _vm.Name,
                 fromAutofill: true);
             await Navigation.PushModalAsync(new NavigationPage(pageForLogin));
         }
 
-        private void Search_Clicked(object sender, EventArgs e)
+        private void Search_Clicked(object sender, System.EventArgs e)
         {
-            var page = new CiphersPage(null, appOptions: _appOptions);
-            Navigation.PushModalAsync(new NavigationPage(page)).FireAndForget();
-        }
-
-        void CloseItem_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                _accountsManager.StartDefaultNavigationFlowAsync(op => op.OtpData = null).FireAndForget();
-            }
+            var page = new CiphersPage(null, autofillUrl: _vm.Uri);
+            Application.Current.MainPage = new NavigationPage(page);
         }
     }
 }

src/App/Pages/Vault/AutofillCiphersPageViewModel.cs

@@ -1,29 +1,91 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.App.Abstractions;
+using Bit.App.Controls;
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core;
+using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
-    public class AutofillCiphersPageViewModel : CipherSelectionPageViewModel
+    public class AutofillCiphersPageViewModel : BaseViewModel
     {
-        private CipherType? _fillType;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;
+        private readonly ICipherService _cipherService;
+        private readonly IStateService _stateService;
+        private readonly IPasswordRepromptService _passwordRepromptService;
+        private readonly IMessagingService _messagingService;
+        private readonly ILogger _logger;
 
+        private bool _showNoData;
+        private bool _showList;
+        private string _noDataText;
+        private bool _websiteIconsEnabled;
+
+        public AutofillCiphersPageViewModel()
+        {
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _logger = ServiceContainer.Resolve<ILogger>("logger");
+
+            GroupedItems = new ObservableRangeCollection<IGroupingsPageListItem>();
+            CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
+
+            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
+            {
+                AllowAddAccountRow = false
+            };
+        }
+
+        public string Name { get; set; }
         public string Uri { get; set; }
+        public Command CipherOptionsCommand { get; set; }
+        public bool LoadedOnce { get; set; }
+        public ObservableRangeCollection<IGroupingsPageListItem> GroupedItems { get; set; }
+        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
 
-        public override void Init(AppOptions appOptions)
+        public bool ShowNoData
+        {
+            get => _showNoData;
+            set => SetProperty(ref _showNoData, value);
+        }
+
+        public bool ShowList
+        {
+            get => _showList;
+            set => SetProperty(ref _showList, value);
+        }
+
+        public string NoDataText
+        {
+            get => _noDataText;
+            set => SetProperty(ref _noDataText, value);
+        }
+        public bool WebsiteIconsEnabled
+        {
+            get => _websiteIconsEnabled;
+            set => SetProperty(ref _websiteIconsEnabled, value);
+        }
+
+        public void Init(AppOptions appOptions)
         {
             Uri = appOptions?.Uri;
-            _fillType = appOptions.FillType;
-
             string name = null;
             if (Uri?.StartsWith(Constants.AndroidAppProtocol) ?? false)
             {
@@ -42,11 +104,14 @@ namespace Bit.App.Pages
             NoDataText = string.Format(AppResources.NoItemsForUri, Name ?? "--");
         }
 
-        protected override async Task<List<GroupingsPageListGroup>> LoadGroupedItemsAsync()
+        public async Task LoadAsync()
         {
+            LoadedOnce = true;
+            ShowList = false;
+            ShowNoData = false;
+            WebsiteIconsEnabled = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
             var groupedItems = new List<GroupingsPageListGroup>();
             var ciphers = await _cipherService.GetAllDecryptedByUrlAsync(Uri, null);
-
             var matching = ciphers.Item1?.Select(c => new GroupingsPageListItem { Cipher = c }).ToList();
             var hasMatching = matching?.Any() ?? false;
             if (matching?.Any() ?? false)
@@ -54,7 +119,6 @@ namespace Bit.App.Pages
                 groupedItems.Add(
                     new GroupingsPageListGroup(matching, AppResources.MatchingItems, matching.Count, false, true));
             }
-
             var fuzzy = ciphers.Item2?.Select(c =>
                 new GroupingsPageListItem { Cipher = c, FuzzyAutofill = true }).ToList();
             if (fuzzy?.Any() ?? false)
@@ -64,88 +128,123 @@ namespace Bit.App.Pages
                     !hasMatching));
             }
 
-            return groupedItems;
+            // TODO: refactor this
+            if (Device.RuntimePlatform == Device.Android
+                ||
+                GroupedItems.Any())
+            {
+                var items = new List<IGroupingsPageListItem>();
+                foreach (var itemGroup in groupedItems)
+                {
+                    items.Add(new GroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
+                    items.AddRange(itemGroup);
+                }
+
+                GroupedItems.ReplaceRange(items);
+            }
+            else
+            {
+                // HACK: we need this on iOS, so that it doesn't crash when adding coming from an empty list
+                var first = true;
+                var items = new List<IGroupingsPageListItem>();
+                foreach (var itemGroup in groupedItems)
+                {
+                    if (!first)
+                    {
+                        items.Add(new GroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
+                    }
+                    else
+                    {
+                        first = false;
+                    }
+                    items.AddRange(itemGroup);
+                }
+
+                if (groupedItems.Any())
+                {
+                    GroupedItems.ReplaceRange(new List<IGroupingsPageListItem> { new GroupingsPageHeaderListItem(groupedItems[0].Name, groupedItems[0].ItemCount) });
+                    GroupedItems.AddRange(items);
+                }
+                else
+                {
+                    GroupedItems.Clear();
+                }
+            }
+            ShowList = groupedItems.Any();
+            ShowNoData = !ShowList;
         }
 
-        protected override async Task SelectCipherAsync(IGroupingsPageListItem item)
+        public async Task SelectCipherAsync(CipherView cipher, bool fuzzy)
         {
-            if (!(item is GroupingsPageListItem listItem) || listItem.Cipher is null)
+            if (cipher == null)
             {
                 return;
             }
-
-            var cipher = listItem.Cipher;
-
             if (_deviceActionService.SystemMajorVersion() < 21)
             {
                 await AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService);
-                return;
             }
-
-            if (cipher.Reprompt != CipherRepromptType.None && !await _passwordRepromptService.ShowPasswordPromptAsync())
+            else
             {
-                return;
-            }
-            var autofillResponse = AppResources.Yes;
-            if (listItem.FuzzyAutofill)
-            {
-                var options = new List<string> { AppResources.Yes };
-                if (cipher.Type == CipherType.Login &&
-                    Xamarin.Essentials.Connectivity.NetworkAccess != Xamarin.Essentials.NetworkAccess.None)
+                if (cipher.Reprompt != CipherRepromptType.None && !await _passwordRepromptService.ShowPasswordPromptAsync())
                 {
-                    options.Add(AppResources.YesAndSave);
+                    return;
                 }
-                autofillResponse = await _deviceActionService.DisplayAlertAsync(null,
-                    string.Format(AppResources.BitwardenAutofillServiceMatchConfirm, Name), AppResources.No,
-                    options.ToArray());
-            }
-            if (autofillResponse == AppResources.YesAndSave && cipher.Type == CipherType.Login)
-            {
-                var uris = cipher.Login?.Uris?.ToList();
-                if (uris == null)
+                var autofillResponse = AppResources.Yes;
+                if (fuzzy)
                 {
-                    uris = new List<LoginUriView>();
-                }
-                uris.Add(new LoginUriView
-                {
-                    Uri = Uri,
-                    Match = null
-                });
-                cipher.Login.Uris = uris;
-                try
-                {
-                    await _deviceActionService.ShowLoadingAsync(AppResources.Saving);
-                    await _cipherService.SaveWithServerAsync(await _cipherService.EncryptAsync(cipher));
-                    await _deviceActionService.HideLoadingAsync();
-                }
-                catch (ApiException e)
-                {
-                    await _deviceActionService.HideLoadingAsync();
-                    if (e?.Error != null)
+                    var options = new List<string> { AppResources.Yes };
+                    if (cipher.Type == CipherType.Login &&
+                        Xamarin.Essentials.Connectivity.NetworkAccess != Xamarin.Essentials.NetworkAccess.None)
                     {
-                        await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
-                            AppResources.AnErrorHasOccurred);
+                        options.Add(AppResources.YesAndSave);
+                    }
+                    autofillResponse = await _deviceActionService.DisplayAlertAsync(null,
+                        string.Format(AppResources.BitwardenAutofillServiceMatchConfirm, Name), AppResources.No,
+                        options.ToArray());
+                }
+                if (autofillResponse == AppResources.YesAndSave && cipher.Type == CipherType.Login)
+                {
+                    var uris = cipher.Login?.Uris?.ToList();
+                    if (uris == null)
+                    {
+                        uris = new List<LoginUriView>();
+                    }
+                    uris.Add(new LoginUriView
+                    {
+                        Uri = Uri,
+                        Match = null
+                    });
+                    cipher.Login.Uris = uris;
+                    try
+                    {
+                        await _deviceActionService.ShowLoadingAsync(AppResources.Saving);
+                        await _cipherService.SaveWithServerAsync(await _cipherService.EncryptAsync(cipher));
+                        await _deviceActionService.HideLoadingAsync();
+                    }
+                    catch (ApiException e)
+                    {
+                        await _deviceActionService.HideLoadingAsync();
+                        if (e?.Error != null)
+                        {
+                            await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                                AppResources.AnErrorHasOccurred);
+                        }
                     }
                 }
-            }
-            if (autofillResponse == AppResources.Yes || autofillResponse == AppResources.YesAndSave)
-            {
-                _autofillHandler.Autofill(cipher);
+                if (autofillResponse == AppResources.Yes || autofillResponse == AppResources.YesAndSave)
+                {
+                    _autofillHandler.Autofill(cipher);
+                }
             }
         }
 
-        protected override async Task AddCipherAsync()
+        private async void CipherOptionsAsync(CipherView cipher)
         {
-            if (_fillType.HasValue && _fillType != CipherType.Login)
+            if ((Page as BaseContentPage).DoOnce())
             {
-                var pageForOther = new CipherAddEditPage(type: _fillType, fromAutofill: true);
-                await Page.Navigation.PushModalAsync(new NavigationPage(pageForOther));
-                return;
+                await AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService);
             }
-
-            var pageForLogin = new CipherAddEditPage(null, CipherType.Login, uri: Uri, name: Name,
-                fromAutofill: true);
-            await Page.Navigation.PushModalAsync(new NavigationPage(pageForLogin));
         }
     }
 }

src/App/Pages/Vault/CipherAddEditPage.xaml

@@ -125,9 +125,7 @@
                     <Entry
                         x:Name="_nameEntry"
                         Text="{Binding Cipher.Name}"
-                        StyleClass="box-value"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n Name}" />
+                        StyleClass="box-value" />
                 </StackLayout>
                 <StackLayout IsVisible="{Binding IsLogin}" Spacing="0" Padding="0">
                     <Grid StyleClass="box-row, box-row-input"
@@ -140,9 +138,7 @@
                             x:Name="_loginUsernameEntry"
                             Text="{Binding Cipher.Login.Username}"
                             StyleClass="box-value" 
-                            Grid.Row="1"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Username}"/>
+                            Grid.Row="1"/>
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
@@ -178,9 +174,7 @@
                             IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                             IsSpellCheckEnabled="False"
                             IsTextPredictionEnabled="False"
-                            IsEnabled="{Binding Cipher.ViewPassword}"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Password}"/>
+                            IsEnabled="{Binding Cipher.ViewPassword}"/>
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
@@ -260,9 +254,7 @@
                             StyleClass="box-value"
                             Grid.Row="1"
                             Grid.Column="0"
-                            Grid.ColumnSpan="{Binding TotpColumnSpan}"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n AuthenticatorKey}" />
+                            Grid.ColumnSpan="{Binding TotpColumnSpan}" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -270,9 +262,7 @@
                             IsVisible="{Binding HasTotpValue}"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CopyTotp}" />
+                            Grid.RowSpan="2" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Camera}}"
@@ -317,9 +307,7 @@
                             Grid.Column="0"
                             IsPassword="{Binding ShowCardNumber, Converter={StaticResource inverseBool}}"
                             IsSpellCheckEnabled="False"
-                            IsTextPredictionEnabled="False"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Number}" />
+                            IsTextPredictionEnabled="False" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding ShowCardNumberIcon}"
@@ -358,9 +346,7 @@
                             x:Name="_cardExpYearEntry"
                             Text="{Binding Cipher.Card.ExpYear}"
                             StyleClass="box-value"
-                            Keyboard="Numeric"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ExpirationYear}" />
+                            Keyboard="Numeric" />
                     </StackLayout>
                     <Grid StyleClass="box-row, box-row-input">
                         <Grid.RowDefinitions>
@@ -385,9 +371,7 @@
                             Keyboard="Numeric"
                             IsPassword="{Binding ShowCardCode, Converter={StaticResource inverseBool}}"
                             IsSpellCheckEnabled="False"
-                            IsTextPredictionEnabled="False"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n SecurityCode}" />
+                            IsTextPredictionEnabled="False" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding ShowCardCodeIcon}"
@@ -417,9 +401,7 @@
                         <Entry
                             x:Name="_identityFirstNameEntry"
                             Text="{Binding Cipher.Identity.FirstName}"
-                            StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n FirstName}"/>
+                            StyleClass="box-value,capitalize-word-input"/>
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -428,9 +410,7 @@
                         <Entry
                             x:Name="_identityMiddleNameEntry"
                             Text="{Binding Cipher.Identity.MiddleName}"
-                            StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n MiddleName}" />
+                            StyleClass="box-value,capitalize-word-input" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -439,9 +419,7 @@
                         <Entry
                             x:Name="_identityLastNameEntry"
                             Text="{Binding Cipher.Identity.LastName}"
-                            StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n LastName}" />
+                            StyleClass="box-value,capitalize-word-input" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -450,9 +428,7 @@
                         <Entry
                             x:Name="_identityUsernameEntry"
                             Text="{Binding Cipher.Identity.Username}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Username}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -461,9 +437,7 @@
                         <Entry
                             x:Name="_identityCompanyEntry"
                             Text="{Binding Cipher.Identity.Company}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Company}"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -472,9 +446,7 @@
                         <Entry
                             x:Name="_identitySsnEntry"
                             Text="{Binding Cipher.Identity.SSN}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n SSN}"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -483,9 +455,7 @@
                         <Entry
                             x:Name="_identityPassportNumberEntry"
                             Text="{Binding Cipher.Identity.PassportNumber}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n PassportNumber}"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -494,9 +464,7 @@
                         <Entry
                             x:Name="_identityLicenseNumberEntry"
                             Text="{Binding Cipher.Identity.LicenseNumber}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n LicenseNumber}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -506,9 +474,7 @@
                             x:Name="_identityEmailEntry"
                             Keyboard="Email"
                             Text="{Binding Cipher.Identity.Email}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Email}"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -518,9 +484,7 @@
                             x:Name="_identityPhoneEntry"
                             Text="{Binding Cipher.Identity.Phone}"
                             Keyboard="Telephone"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Phone}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -529,9 +493,7 @@
                         <Entry
                             x:Name="_identityAddress1Entry"
                             Text="{Binding Cipher.Identity.Address1}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address1}"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -540,9 +502,7 @@
                         <Entry
                             x:Name="_identityAddress2Entry"
                             Text="{Binding Cipher.Identity.Address2}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address2}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -551,9 +511,7 @@
                         <Entry
                             x:Name="_identityAddress3Entry"
                             Text="{Binding Cipher.Identity.Address3}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address3}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -562,9 +520,7 @@
                         <Entry
                             x:Name="_identityCityEntry"
                             Text="{Binding Cipher.Identity.City}"
-                            StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CityTown}" />
+                            StyleClass="box-value,capitalize-sentence-input" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -573,9 +529,7 @@
                         <Entry
                             x:Name="_identityStateEntry"
                             Text="{Binding Cipher.Identity.State}"
-                            StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n StateProvince}" />
+                            StyleClass="box-value,capitalize-sentence-input" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -584,9 +538,7 @@
                         <Entry
                             x:Name="_identityPostalCodeEntry"
                             Text="{Binding Cipher.Identity.PostalCode}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ZipPostalCode}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -595,9 +547,7 @@
                         <Entry
                             x:Name="_identityCountryEntry"
                             Text="{Binding Cipher.Identity.Country}"
-                            StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Country}" />
+                            StyleClass="box-value,capitalize-sentence-input" />
                     </StackLayout>
                 </StackLayout>
             </StackLayout>
@@ -628,9 +578,7 @@
                                     Keyboard="Url"
                                     StyleClass="box-value"
                                     Grid.Row="1"
-                                    Grid.Column="0"
-                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n URI}" />
+                                    Grid.Column="0" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
@@ -683,7 +631,7 @@
                         Command="{Binding PasswordPromptHelpCommand}"
                         TextColor="{DynamicResource MutedColor}"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n MasterPasswordRePromptHelp}"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
                         HorizontalOptions="StartAndExpand" />
                     <Switch
                         IsToggled="{Binding PasswordPrompt}"
@@ -704,9 +652,7 @@
                         AutoSize="TextChanges"
                         StyleClass="box-value"
                         effects:ScrollEnabledEffect.IsScrollEnabled="false"
-                        Text="{Binding Cipher.Notes}"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n Notes}" >
+                        Text="{Binding Cipher.Notes}">
                         <Editor.Behaviors>
                             <behaviors:EditorPreventAutoBottomScrollingOnFocusedBehavior ParentScrollView="{x:Reference _scrollView}" />
                         </Editor.Behaviors>
@@ -771,7 +717,7 @@
                                     <Switch
                                         IsToggled="{Binding Checked}"
                                         StyleClass="box-value"
-                                        HorizontalOptions="End"/>
+                                        HorizontalOptions="End" />
                                 </StackLayout>
                                 <BoxView StyleClass="box-row-separator" />
                             </StackLayout>

src/App/Pages/Vault/CipherAddEditPageViewModel.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Bit.App.Abstractions;
 using Bit.App.Lists.ItemViewModels.CustomFields;
 using Bit.App.Models;
 using Bit.App.Resources;
@@ -31,7 +30,6 @@ namespace Bit.App.Pages
         private readonly IClipboardService _clipboardService;
         private readonly IAutofillHandler _autofillHandler;
         private readonly IWatchDeviceService _watchDeviceService;
-        private readonly IAccountsManager _accountsManager;
 
         private bool _showNotesSeparator;
         private bool _showPassword;
@@ -46,8 +44,6 @@ namespace Bit.App.Pages
         private bool _hasCollections;
         private string _previousCipherId;
         private List<Core.Models.View.CollectionView> _writeableCollections;
-        private bool _fromOtp;
-
         protected override string[] AdditionalPropertiesToRaiseOnCipherChanged => new string[]
         {
             nameof(IsLogin),
@@ -86,8 +82,6 @@ namespace Bit.App.Pages
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
             _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
             _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
-            _accountsManager = ServiceContainer.Resolve<IAccountsManager>();
-
 
             GeneratePasswordCommand = new Command(GeneratePassword);
             TogglePasswordCommand = new Command(TogglePassword);
@@ -121,7 +115,6 @@ namespace Bit.App.Pages
                 new KeyValuePair<string, string>("JCB", "JCB"),
                 new KeyValuePair<string, string>("Maestro", "Maestro"),
                 new KeyValuePair<string, string>("UnionPay", "UnionPay"),
-                new KeyValuePair<string, string>("RuPay", "RuPay"),
                 new KeyValuePair<string, string>(AppResources.Other, "Other")
             };
             CardExpMonthOptions = new List<KeyValuePair<string, string>>
@@ -309,7 +302,6 @@ namespace Bit.App.Pages
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public bool HasTotpValue => IsLogin && !string.IsNullOrEmpty(Cipher?.Login?.Totp);
         public string SetupTotpText => $"{BitwardenIcons.Camera} {AppResources.SetupTotp}";
-
         public void Init()
         {
             PageTitle = EditMode && !CloneMode ? AppResources.EditItem : AppResources.AddItem;
@@ -317,8 +309,6 @@ namespace Bit.App.Pages
 
         public async Task<bool> LoadAsync(AppOptions appOptions = null)
         {
-            _fromOtp = appOptions?.OtpData != null;
-
             var myEmail = await _stateService.GetEmailAsync();
             OwnershipOptions.Add(new KeyValuePair<string, string>(myEmail, null));
             var orgs = await _organizationService.GetAllAsync();
@@ -368,10 +358,6 @@ namespace Bit.App.Pages
                             Cipher.OrganizationId = OrganizationId;
                         }
                     }
-                    if (appOptions?.OtpData != null && Cipher.Type == CipherType.Login)
-                    {
-                        Cipher.Login.Totp = appOptions.OtpData.Value.Uri;
-                    }
                 }
                 else
                 {
@@ -394,7 +380,6 @@ namespace Bit.App.Pages
                         Cipher.Type = appOptions.SaveType.GetValueOrDefault(Cipher.Type);
                         Cipher.Login.Username = appOptions.SaveUsername;
                         Cipher.Login.Password = appOptions.SavePassword;
-                        Cipher.Login.Totp = appOptions.OtpData?.Uri;
                         Cipher.Card.Code = appOptions.SaveCardCode;
                         if (int.TryParse(appOptions.SaveCardExpMonth, out int month) && month <= 12 && month >= 1)
                         {
@@ -439,11 +424,6 @@ namespace Bit.App.Pages
                 {
                     Fields.ResetWithRange(Cipher.Fields?.Select(f => _customFieldItemFactory.CreateCustomFieldItem(f, true, Cipher, null, null, FieldOptionsCommand)));
                 }
-
-                if (appOptions?.OtpData != null)
-                {
-                    _platformUtilsService.ShowToast(null, AppResources.AuthenticatorKey, AppResources.AuthenticatorKeyAdded);
-                }
             }
 
             if (EditMode && _previousCipherId != CipherId)
@@ -537,10 +517,6 @@ namespace Bit.App.Pages
                     // Close and go back to app
                     _autofillHandler.CloseAutofill();
                 }
-                else if (_fromOtp)
-                {
-                    await _accountsManager.StartDefaultNavigationFlowAsync(op => op.OtpData = null);
-                }
                 else
                 {
                     if (CloneMode)

src/App/Pages/Vault/CipherSelectionPageViewModel.cs

@@ -1,167 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Controls;
-using Bit.App.Models;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public abstract class CipherSelectionPageViewModel : BaseViewModel
-    {
-        protected readonly IPlatformUtilsService _platformUtilsService;
-        protected readonly IDeviceActionService _deviceActionService;
-        protected readonly IAutofillHandler _autofillHandler;
-        protected readonly ICipherService _cipherService;
-        protected readonly IStateService _stateService;
-        protected readonly IPasswordRepromptService _passwordRepromptService;
-        protected readonly IMessagingService _messagingService;
-        protected readonly ILogger _logger;
-
-        protected bool _showNoData;
-        protected bool _showList;
-        protected string _noDataText;
-        protected bool _websiteIconsEnabled;
-
-        public CipherSelectionPageViewModel()
-        {
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _cipherService = ServiceContainer.Resolve<ICipherService>();
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>();
-            _messagingService = ServiceContainer.Resolve<IMessagingService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-
-            GroupedItems = new ObservableRangeCollection<IGroupingsPageListItem>();
-            CipherOptionsCommand = new AsyncCommand<CipherView>(cipher => AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService),
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-            SelectCipherCommand = new AsyncCommand<IGroupingsPageListItem>(SelectCipherAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-            AddCipherCommand = new AsyncCommand(AddCipherAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
-            {
-                AllowAddAccountRow = false
-            };
-        }
-
-        public string Name { get; set; }
-        public bool LoadedOnce { get; set; }
-        public ObservableRangeCollection<IGroupingsPageListItem> GroupedItems { get; set; }
-        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
-
-        public ICommand CipherOptionsCommand { get; set; }
-        public ICommand SelectCipherCommand { get; set; }
-        public ICommand AddCipherCommand { get; set; }
-
-        public bool ShowNoData
-        {
-            get => _showNoData;
-            set => SetProperty(ref _showNoData, value, additionalPropertyNames: new string[] { nameof(ShowCallout) });
-        }
-
-        public bool ShowList
-        {
-            get => _showList;
-            set => SetProperty(ref _showList, value);
-        }
-
-        public string NoDataText
-        {
-            get => _noDataText;
-            set => SetProperty(ref _noDataText, value);
-        }
-
-        public bool WebsiteIconsEnabled
-        {
-            get => _websiteIconsEnabled;
-            set => SetProperty(ref _websiteIconsEnabled, value);
-        }
-
-        public virtual bool ShowCallout => false;
-
-        public abstract void Init(Models.AppOptions options);
-
-        public async Task LoadAsync()
-        {
-            LoadedOnce = true;
-            ShowList = false;
-            ShowNoData = false;
-            WebsiteIconsEnabled = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
-
-            var groupedItems = await LoadGroupedItemsAsync();
-
-            // TODO: refactor this
-            if (Device.RuntimePlatform == Device.Android
-                ||
-                GroupedItems.Any())
-            {
-                var items = new List<IGroupingsPageListItem>();
-                foreach (var itemGroup in groupedItems)
-                {
-                    items.Add(new GroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
-                    items.AddRange(itemGroup);
-                }
-
-                GroupedItems.ReplaceRange(items);
-            }
-            else
-            {
-                // HACK: we need this on iOS, so that it doesn't crash when adding coming from an empty list
-                var first = true;
-                var items = new List<IGroupingsPageListItem>();
-                foreach (var itemGroup in groupedItems)
-                {
-                    if (!first)
-                    {
-                        items.Add(new GroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
-                    }
-                    else
-                    {
-                        first = false;
-                    }
-                    items.AddRange(itemGroup);
-                }
-
-                await Device.InvokeOnMainThreadAsync(() =>
-                {
-                    if (groupedItems.Any())
-                    {
-                        GroupedItems.ReplaceRange(new List<IGroupingsPageListItem> { new GroupingsPageHeaderListItem(groupedItems[0].Name, groupedItems[0].ItemCount) });
-                        GroupedItems.AddRange(items);
-                    }
-                    else
-                    {
-                        GroupedItems.Clear();
-                    }
-                });
-            }
-            await Device.InvokeOnMainThreadAsync(() =>
-            {
-                ShowList = groupedItems.Any();
-                ShowNoData = !ShowList;
-            });
-        }
-
-        protected abstract Task<List<GroupingsPageListGroup>> LoadGroupedItemsAsync();
-
-        protected abstract Task SelectCipherAsync(IGroupingsPageListItem item);
-
-        protected abstract Task AddCipherAsync();
-    }
-}

src/App/Pages/Vault/CiphersPage.xaml

@@ -81,22 +81,12 @@
                VerticalOptions="CenterAndExpand"
                HorizontalOptions="CenterAndExpand"
                HorizontalTextAlignment="Center" />
-        <StackLayout
-            HorizontalOptions="Center"
-            VerticalOptions="StartAndExpand"
-            Margin="20, 80, 20, 0"
-            Spacing="20"
-            IsVisible="{Binding ShowNoData}">
-            <Image
-                Source="empty_items_state" />
-            <Label
-                Text="{u:I18n ThereAreNoItemsThatMatchTheSearch}"
-                HorizontalTextAlignment="Center" />
-            <Button
-                Text="{u:I18n AddAnItem}"
-                Command="{Binding AddCipherCommand}"
-                IsVisible="{Binding ShowAddCipher}"/>
-        </StackLayout>
+        <Label IsVisible="{Binding ShowNoData}"
+               Text="{u:I18n NoItemsToList}"
+               Margin="20, 0"
+               VerticalOptions="CenterAndExpand"
+               HorizontalOptions="CenterAndExpand"
+               HorizontalTextAlignment="Center" />
         <controls:ExtendedCollectionView
                 IsVisible="{Binding ShowList}"
                 ItemsSource="{Binding Ciphers}"

src/App/Pages/Vault/CiphersPage.xaml.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using Bit.App.Controls;
-using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.View;
@@ -18,18 +17,15 @@ namespace Bit.App.Pages
         private CiphersPageViewModel _vm;
         private bool _hasFocused;
 
-        public CiphersPage(Func<CipherView, bool> filter,
-            string pageTitle = null,
-            string vaultFilterSelection = null,
-            bool deleted = false,
-            AppOptions appOptions = null)
+        public CiphersPage(Func<CipherView, bool> filter, string pageTitle = null, string vaultFilterSelection = null,
+            string autofillUrl = null, bool deleted = false)
         {
             InitializeComponent();
             _vm = BindingContext as CiphersPageViewModel;
             _vm.Page = this;
-            _autofillUrl = appOptions?.Uri;
-            _vm.Prepare(filter, deleted, appOptions);
-
+            _vm.Filter = filter;
+            _vm.AutofillUrl = _autofillUrl = autofillUrl;
+            _vm.Deleted = deleted;
             if (pageTitle != null)
             {
                 _vm.PageTitle = string.Format(AppResources.SearchGroup, pageTitle);

src/App/Pages/Vault/CiphersPageViewModel.cs

@@ -3,16 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Abstractions;
-using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -34,7 +31,6 @@ namespace Bit.App.Pages
         private bool _showNoData;
         private bool _showList;
         private bool _websiteIconsEnabled;
-        private AppOptions _appOptions;
 
         public CiphersPageViewModel()
         {
@@ -50,21 +46,14 @@ namespace Bit.App.Pages
             _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             Ciphers = new ExtendedObservableCollection<CipherView>();
-            CipherOptionsCommand = new AsyncCommand<CipherView>(cipher => Utilities.AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService),
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-            AddCipherCommand = new AsyncCommand(AddCipherAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
+            CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
         }
 
-        public ICommand CipherOptionsCommand { get; }
-        public ICommand AddCipherCommand { get; }
+        public Command CipherOptionsCommand { get; set; }
         public ExtendedObservableCollection<CipherView> Ciphers { get; set; }
         public Func<CipherView, bool> Filter { get; set; }
         public string AutofillUrl { get; set; }
         public bool Deleted { get; set; }
-        public bool ShowAllIfSearchTextEmpty { get; set; }
 
         protected override ICipherService cipherService => _cipherService;
         protected override IPolicyService policyService => _policyService;
@@ -76,8 +65,7 @@ namespace Bit.App.Pages
             get => _showNoData;
             set => SetProperty(ref _showNoData, value, additionalPropertyNames: new string[]
             {
-                nameof(ShowSearchDirection),
-                nameof(ShowAddCipher)
+                nameof(ShowSearchDirection)
             });
         }
 
@@ -92,23 +80,12 @@ namespace Bit.App.Pages
 
         public bool ShowSearchDirection => !ShowList && !ShowNoData;
 
-        public bool ShowAddCipher => ShowNoData && _appOptions?.OtpData != null;
-
         public bool WebsiteIconsEnabled
         {
             get => _websiteIconsEnabled;
             set => SetProperty(ref _websiteIconsEnabled, value);
         }
 
-        internal void Prepare(Func<CipherView, bool> filter, bool deleted, AppOptions appOptions)
-        {
-            Filter = filter;
-            AutofillUrl = appOptions?.Uri;
-            Deleted = deleted;
-            ShowAllIfSearchTextEmpty = appOptions?.OtpData != null;
-            _appOptions = appOptions;
-        }
-
         public async Task InitAsync()
         {
             await InitVaultFilterAsync(true);
@@ -124,33 +101,25 @@ namespace Bit.App.Pages
             {
                 List<CipherView> ciphers = null;
                 var searchable = !string.IsNullOrWhiteSpace(searchText) && searchText.Length > 1;
-                var shouldShowAllWhenEmpty = ShowAllIfSearchTextEmpty && string.IsNullOrEmpty(searchText);
-                if (searchable || shouldShowAllWhenEmpty)
+                if (searchable)
                 {
                     if (timeout != null)
                     {
                         await Task.Delay(timeout.Value);
                     }
-                    if (searchText != (Page as CiphersPage).SearchBar.Text
-                        &&
-                        !shouldShowAllWhenEmpty)
+                    if (searchText != (Page as CiphersPage).SearchBar.Text)
                     {
                         return;
                     }
-
-                    previousCts?.Cancel();
+                    else
+                    {
+                        previousCts?.Cancel();
+                    }
                     try
                     {
                         var vaultFilteredCiphers = await GetAllCiphersAsync();
-                        if (!shouldShowAllWhenEmpty)
-                        {
-                            ciphers = await _searchService.SearchCiphersAsync(searchText,
-                                Filter ?? (c => c.IsDeleted == Deleted), vaultFilteredCiphers, cts.Token);
-                        }
-                        else
-                        {
-                            ciphers = vaultFilteredCiphers;
-                        }
+                        ciphers = await _searchService.SearchCiphersAsync(searchText,
+                            Filter ?? (c => c.IsDeleted == Deleted), vaultFilteredCiphers, cts.Token);
                         cts.Token.ThrowIfCancellationRequested();
                     }
                     catch (OperationCanceledException)
@@ -165,8 +134,8 @@ namespace Bit.App.Pages
                 Device.BeginInvokeOnMainThread(() =>
                 {
                     Ciphers.ResetWithRange(ciphers);
-                    ShowNoData = !shouldShowAllWhenEmpty && searchable && Ciphers.Count == 0;
-                    ShowList = (searchable || shouldShowAllWhenEmpty) && !ShowNoData;
+                    ShowNoData = searchable && Ciphers.Count == 0;
+                    ShowList = searchable && !ShowNoData;
                 });
             }, cts.Token);
             _searchCancellationTokenSource = cts;
@@ -175,7 +144,6 @@ namespace Bit.App.Pages
         public async Task SelectCipherAsync(CipherView cipher)
         {
             string selection = null;
-
             if (!string.IsNullOrWhiteSpace(AutofillUrl))
             {
                 var options = new List<string> { AppResources.Autofill };
@@ -188,19 +156,6 @@ namespace Bit.App.Pages
                 selection = await Page.DisplayActionSheet(AppResources.AutofillOrView, AppResources.Cancel, null,
                     options.ToArray());
             }
-
-            if (_appOptions?.OtpData != null)
-            {
-                if (cipher.Reprompt != CipherRepromptType.None && !await _passwordRepromptService.ShowPasswordPromptAsync())
-                {
-                    return;
-                }
-
-                var editCipherPage = new CipherAddEditPage(cipher.Id, appOptions: _appOptions);
-                await Page.Navigation.PushModalAsync(new NavigationPage(editCipherPage));
-                return;
-            }
-
             if (selection == AppResources.View || string.IsNullOrWhiteSpace(AutofillUrl))
             {
                 var page = new CipherDetailsPage(cipher.Id);
@@ -250,7 +205,7 @@ namespace Bit.App.Pages
 
         private void PerformSearchIfPopulated()
         {
-            if (!string.IsNullOrWhiteSpace((Page as CiphersPage).SearchBar.Text) || ShowAllIfSearchTextEmpty)
+            if (!string.IsNullOrWhiteSpace((Page as CiphersPage).SearchBar.Text))
             {
                 Search((Page as CiphersPage).SearchBar.Text, 200);
             }
@@ -261,10 +216,12 @@ namespace Bit.App.Pages
             PerformSearchIfPopulated();
         }
 
-        private async Task AddCipherAsync()
+        private async void CipherOptionsAsync(CipherView cipher)
         {
-            var pageForLogin = new CipherAddEditPage(null, CipherType.Login, name: _appOptions?.OtpData?.Issuer ?? _appOptions?.OtpData?.AccountName, appOptions: _appOptions);
-            await Page.Navigation.PushModalAsync(new NavigationPage(pageForLogin));
+            if ((Page as BaseContentPage).DoOnce())
+            {
+                await Utilities.AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService);
+            }
         }
     }
 }

src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs

@@ -78,9 +78,7 @@ namespace Bit.App.Pages
                 Refreshing = true;
                 await LoadAsync();
             });
-            CipherOptionsCommand = new AsyncCommand<CipherView>(cipher => AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService),
-                onException: ex => _logger.Exception(ex),
-                allowsMultipleExecutions: false);
+            CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
             VaultFilterCommand = new AsyncCommand(VaultFilterOptionsAsync,
                 onException: ex => _logger.Exception(ex),
                 allowsMultipleExecutions: false);
@@ -170,7 +168,7 @@ namespace Bit.App.Pages
         public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
         public ObservableRangeCollection<IGroupingsPageListItem> GroupedItems { get; set; }
         public Command RefreshCommand { get; set; }
-        public ICommand CipherOptionsCommand { get; }
+        public Command<CipherView> CipherOptionsCommand { get; set; }
         public bool LoadedOnce { get; set; }
 
         public async Task LoadAsync()
@@ -711,5 +709,13 @@ namespace Bit.App.Pages
             var folders = decFolders.Where(f => _allCiphers.Any(c => c.FolderId == f.Id)).ToList();
             return folders.Any() ? folders : null;
         }
+
+        private async void CipherOptionsAsync(CipherView cipher)
+        {
+            if ((Page as BaseContentPage).DoOnce())
+            {
+                await AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService);
+            }
+        }
     }
 }

src/App/Pages/Vault/OTPCipherSelectionPageViewModel.cs

@@ -1,79 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class OTPCipherSelectionPageViewModel : CipherSelectionPageViewModel
-    {
-        private readonly ISearchService _searchService = ServiceContainer.Resolve<ISearchService>();
-
-        private OtpData _otpData;
-        private Models.AppOptions _appOptions;
-
-        public override bool ShowCallout => !ShowNoData;
-
-        public override void Init(Models.AppOptions options)
-        {
-            _appOptions = options;
-            _otpData = options.OtpData.Value;
-
-            Name = _otpData.Issuer ?? _otpData.AccountName;
-            PageTitle = string.Format(AppResources.ItemsForUri, Name ?? "--");
-            NoDataText = string.Format(AppResources.ThereAreNoItemsInYourVaultThatMatchX, Name ?? "--")
-                + Environment.NewLine
-                + AppResources.SearchForAnItemOrAddANewItem;
-        }
-
-        protected override async Task<List<GroupingsPageListGroup>> LoadGroupedItemsAsync()
-        {
-            var groupedItems = new List<GroupingsPageListGroup>();
-            var allCiphers = await _cipherService.GetAllDecryptedAsync();
-            var ciphers = await _searchService.SearchCiphersAsync(_otpData.Issuer ?? _otpData.AccountName,
-                            c => c.Type == CipherType.Login && !c.IsDeleted, allCiphers);
-
-            if (ciphers?.Any() ?? false)
-            {
-                groupedItems.Add(
-                    new GroupingsPageListGroup(ciphers.Select(c => new GroupingsPageListItem { Cipher = c }).ToList(),
-                        AppResources.MatchingItems,
-                        ciphers.Count,
-                        false,
-                        true));
-            }
-
-            return groupedItems;
-        }
-
-        protected override async Task SelectCipherAsync(IGroupingsPageListItem item)
-        {
-            if (!(item is GroupingsPageListItem listItem) || listItem.Cipher is null)
-            {
-                return;
-            }
-
-            var cipher = listItem.Cipher;
-
-            if (cipher.Reprompt != CipherRepromptType.None && !await _passwordRepromptService.ShowPasswordPromptAsync())
-            {
-                return;
-            }
-
-            var editCipherPage = new CipherAddEditPage(cipher.Id, appOptions: _appOptions);
-            await Page.Navigation.PushModalAsync(new NavigationPage(editCipherPage));
-            return;
-        }
-
-        protected override async Task AddCipherAsync()
-        {
-            var pageForLogin = new CipherAddEditPage(null, CipherType.Login, name: Name, appOptions: _appOptions);
-            await Page.Navigation.PushModalAsync(new NavigationPage(pageForLogin));
-        }
-    }
-}

src/App/Resources/AppResources.Designer.cs

@@ -202,24 +202,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Biometric unlock for this account is disabled pending verification of master password..
-        /// </summary>
-        public static string AccountBiometricInvalidated {
-            get {
-                return ResourceManager.GetString("AccountBiometricInvalidated", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Autofill biometric unlock for this account is disabled pending verification of master password..
-        /// </summary>
-        public static string AccountBiometricInvalidatedExtension {
-            get {
-                return ResourceManager.GetString("AccountBiometricInvalidatedExtension", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Your new account has been created! You may now log in..
         /// </summary>
@@ -400,15 +382,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Add the key to an existing or new item.
-        /// </summary>
-        public static string AddTheKeyToAnExistingOrNewItem {
-            get {
-                return ResourceManager.GetString("AddTheKeyToAnExistingOrNewItem", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Add TOTP.
         /// </summary>
@@ -985,6 +958,24 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Biometric unlock disabled pending verification of master password..
+        /// </summary>
+        public static string BiometricInvalidated {
+            get {
+                return ResourceManager.GetString("BiometricInvalidated", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Biometric unlock for autofill disabled pending verification of master password..
+        /// </summary>
+        public static string BiometricInvalidatedExtension {
+            get {
+                return ResourceManager.GetString("BiometricInvalidatedExtension", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Biometrics.
         /// </summary>
@@ -1687,15 +1678,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Current master password.
-        /// </summary>
-        public static string CurrentMasterPassword {
-            get {
-                return ResourceManager.GetString("CurrentMasterPassword", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Custom.
         /// </summary>
@@ -1750,15 +1732,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Data region.
-        /// </summary>
-        public static string DataRegion {
-            get {
-                return ResourceManager.GetString("DataRegion", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Password updated.
         /// </summary>
@@ -1831,15 +1804,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Default (System).
-        /// </summary>
-        public static string DefaultSystem {
-            get {
-                return ResourceManager.GetString("DefaultSystem", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Default URI match detection.
         /// </summary>
@@ -2335,15 +2299,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to EU.
-        /// </summary>
-        public static string EU {
-            get {
-                return ResourceManager.GetString("EU", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Exact.
         /// </summary>
@@ -3415,33 +3370,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Language.
-        /// </summary>
-        public static string Language {
-            get {
-                return ResourceManager.GetString("Language", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Language change requires app restart.
-        /// </summary>
-        public static string LanguageChangeRequiresAppRestart {
-            get {
-                return ResourceManager.GetString("LanguageChangeRequiresAppRestart", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The language has been changed to {0}. Please restart the app to see the change.
-        /// </summary>
-        public static string LanguageChangeXDescription {
-            get {
-                return ResourceManager.GetString("LanguageChangeXDescription", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Last name.
         /// </summary>
@@ -3541,15 +3469,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Load from file.
-        /// </summary>
-        public static string LoadFromFile {
-            get {
-                return ResourceManager.GetString("LoadFromFile", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Loading.
         /// </summary>
@@ -3596,11 +3515,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Logging in as {0} on {1}.
+        ///   Looks up a localized string similar to Logging in as {0}.
         /// </summary>
-        public static string LoggingInAsXOnY {
+        public static string LoggingInAsX {
             get {
-                return ResourceManager.GetString("LoggingInAsXOnY", resourceCulture);
+                return ResourceManager.GetString("LoggingInAsX", resourceCulture);
             }
         }
         
@@ -3751,7 +3670,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Log in with device.
+        ///   Looks up a localized string similar to Log In with another device.
         /// </summary>
         public static string LogInWithAnotherDevice {
             get {
@@ -3868,11 +3787,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Master password must be at least {0} characters long..
+        ///   Looks up a localized string similar to Master password must be at least 8 characters long..
         /// </summary>
-        public static string MasterPasswordLengthValMessageX {
+        public static string MasterPasswordLengthValMessage {
             get {
-                return ResourceManager.GetString("MasterPasswordLengthValMessageX", resourceCulture);
+                return ResourceManager.GetString("MasterPasswordLengthValMessage", resourceCulture);
             }
         }
         
@@ -3903,15 +3822,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Master password re-prompt help.
-        /// </summary>
-        public static string MasterPasswordRePromptHelp {
-            get {
-                return ResourceManager.GetString("MasterPasswordRePromptHelp", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Match detection.
         /// </summary>
@@ -4109,7 +4019,18 @@ namespace Bit.App.Resources {
                 return ResourceManager.GetString("Ms", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to Mx.
+        /// </summary>
+        public static string Mx
+        {
+            get
+            {
+                return ResourceManager.GetString("Mx", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to You must log into the main Bitwarden app before you can use the extension..
         /// </summary>
@@ -4128,15 +4049,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Mx.
-        /// </summary>
-        public static string Mx {
-            get {
-                return ResourceManager.GetString("Mx", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to My vault.
         /// </summary>
@@ -4651,15 +4563,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Organization SSO identifier required..
-        /// </summary>
-        public static string OrganizationSsoIdentifierRequired {
-            get {
-                return ResourceManager.GetString("OrganizationSsoIdentifierRequired", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Organization identifier.
         /// </summary>
@@ -5165,15 +5068,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Region.
-        /// </summary>
-        public static string Region {
-            get {
-                return ResourceManager.GetString("Region", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Remember me.
         /// </summary>
@@ -5399,15 +5293,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Search for an item or add a new item.
-        /// </summary>
-        public static string SearchForAnItemOrAddANewItem {
-            get {
-                return ResourceManager.GetString("SearchForAnItemOrAddANewItem", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Search {0}.
         /// </summary>
@@ -5507,15 +5392,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Self-hosted.
-        /// </summary>
-        public static string SelfHosted {
-            get {
-                return ResourceManager.GetString("SelfHosted", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Self-hosted environment.
         /// </summary>
@@ -6110,24 +5986,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to There are no items in your vault that match &quot;{0}&quot;.
-        /// </summary>
-        public static string ThereAreNoItemsInYourVaultThatMatchX {
-            get {
-                return ResourceManager.GetString("ThereAreNoItemsInYourVaultThatMatchX", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to There are no items that match the search.
-        /// </summary>
-        public static string ThereAreNoItemsThatMatchTheSearch {
-            get {
-                return ResourceManager.GetString("ThereAreNoItemsThatMatchTheSearch", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to 30 days.
         /// </summary>
@@ -6443,15 +6301,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.
-        /// </summary>
-        public static string UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve {
-            get {
-                return ResourceManager.GetString("UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Unlock vault.
         /// </summary>
@@ -6524,15 +6373,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour..
-        /// </summary>
-        public static string UpdateWeakMasterPasswordWarning {
-            get {
-                return ResourceManager.GetString("UpdateWeakMasterPasswordWarning", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Updating password.
         /// </summary>
@@ -6587,15 +6427,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to US.
-        /// </summary>
-        public static string US {
-            get {
-                return ResourceManager.GetString("US", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Use another two-step login method.
         /// </summary>
@@ -6767,15 +6598,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Your organization policies have set your vault timeout action to {0}..
-        /// </summary>
-        public static string VaultTimeoutActionPolicyInEffect {
-            get {
-                return ResourceManager.GetString("VaultTimeoutActionPolicyInEffect", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?.
         /// </summary>
@@ -6786,7 +6608,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s)..
+        ///   Looks up a localized string similar to Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s).
         /// </summary>
         public static string VaultTimeoutPolicyInEffect {
             get {
@@ -6794,15 +6616,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}..
-        /// </summary>
-        public static string VaultTimeoutPolicyWithActionInEffect {
-            get {
-                return ResourceManager.GetString("VaultTimeoutPolicyWithActionInEffect", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Your vault timeout exceeds the restrictions set by your organization..
         /// </summary>

src/App/Resources/AppResources.af.resx

@@ -583,8 +583,8 @@
   <data name="MasterPasswordHintDescription" xml:space="preserve">
     <value>’n Hoofwagwoordwenk kan u help om u wagwoord te onthou indien u dit sou vergeet.</value>
   </data>
-  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Die hoofwagwoord moet ten minste {0} karakters lank wees.</value>
+  <data name="MasterPasswordLengthValMessage" xml:space="preserve">
+    <value>Hoofwagwoord moet ten minste 8 karakters lank wees.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>Min. aantal syfers</value>
@@ -1752,11 +1752,11 @@ Skandering gebeur outomaties.</value>
     <value>Wil u dit regtig na die asblik stuur?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometriese ontgrendeling vir hierdie rekening is gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometriese ontgrendeling gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
   </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Outovul-biometriese ontgrendeline vir hierdie rekening is gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometriese ontgrendeling vir outovul gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Aktiveer sinchronisering by verfrissing</value>
@@ -2142,16 +2142,10 @@ Skandering gebeur outomaties.</value>
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
     <value>U organisasiebeleide beïnvloed u kluisuitelling. Maksimum toegelate kluisuittelling is {0} uur en {1} minuut(e).</value>
   </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Jou organisasie se beleid affekteer jou kluis-uittel tyd. Maksimum toelaatbare kluis-uittel tyd is {0} uur(ure) en {1} minuut(minute). Jou kluis-uittel aksie is gestel na {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Jou organisasie se beleid het jou kluis-uittel aksie na {0} verander.</value>
-  </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>U kluisuittelling oorskry die beperkinge wat deur u organisasie daargestel is.</value>
   </data>
-  <data name="DisablePersonalVaultExportPolicyInEffect" xml:space="preserve">
+  <data name="DisablePersonalVaultExportPolicyInEffect">
     <value>Een of meer organisasiebeleide verhoed u om u persoonlike kluis uit te stuur.</value>
   </data>
   <data name="AddAccount" xml:space="preserve">
@@ -2495,8 +2489,8 @@ Wil u na die rekening omskakel?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Kry hoofwagwoord wenk</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Teken aan as {0} op {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Teken in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Nie jy nie?</value>
@@ -2529,111 +2523,57 @@ Wil u na die rekening omskakel?</value>
     <value>Hierdie versoek is nie langer gelding nie</value>
   </data>
   <data name="PendingLogInRequests" xml:space="preserve">
-    <value>In afwagting vir aantekeningsversoeke</value>
+    <value>Pending login requests</value>
   </data>
   <data name="DeclineAllRequests" xml:space="preserve">
-    <value>Weier alle versoeke</value>
+    <value>Decline all requests</value>
   </data>
   <data name="AreYouSureYouWantToDeclineAllPendingLogInRequests" xml:space="preserve">
-    <value>Is jy seker dat jy alle hangende aantekeningsversoeke wil weier?</value>
+    <value>Are you sure you want to decline all pending login requests?</value>
   </data>
   <data name="RequestsDeclined" xml:space="preserve">
-    <value>Versoeke geweier</value>
+    <value>Requests declined</value>
   </data>
   <data name="NoPendingRequests" xml:space="preserve">
-    <value>Geen hangende versoeke</value>  
+    <value>No pending requests</value>  
   </data>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
     <value>Laat die kamera versoek toe om die skandeerder te gebruik</value>
   </data>
-  <data name="Language" xml:space="preserve">
-    <value>Taal</value>
-  </data>
-  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>Die taal is na {0} verander. Asseblief herbegin die toep om die veranderinge te sien</value>
-  </data>
-  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Die taal verandering vereis 'n herbegin van die toep</value>
-  </data>
-  <data name="DefaultSystem" xml:space="preserve">
-    <value>Verstek (Sisteem)</value>
-  </data>
   <data name="Important" xml:space="preserve">
-    <value>Belangrik</value>
+    <value>Important</value>
   </data>
   <data name="YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum" xml:space="preserve">
-    <value>Jou hoofwagwoord kan nie geherstel word as jy dit vergeet het nie! {0} karakters minimum.</value>
+    <value>Your master password cannot be recovered if you forget it! {0} characters minimum.</value>
   </data>
   <data name="WeakMasterPassword" xml:space="preserve">
     <value>Swak Hoofwagwoord</value>
   </data>
   <data name="WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount" xml:space="preserve">
-    <value>Swak wagwoord geïdentifiseer. Gebruik 'n sterk wagwoord om jou rekening te beskerm. Is jy seker dat jy 'n swak wagwoord wil gebruik?</value>
+    <value>Weak password identified. Use a strong password to protect your account. Are you sure you want to use a weak password?</value>
   </data>
   <data name="Weak" xml:space="preserve">
     <value>Swak</value>
   </data>
   <data name="Good" xml:space="preserve">
-    <value>Goed</value>
+    <value>Good</value>
   </data>
   <data name="Strong" xml:space="preserve">
-    <value>Sterk</value>
+    <value>Strong</value>
   </data>
   <data name="CheckKnownDataBreachesForThisPassword" xml:space="preserve">
-    <value>Ondersoek bekende data lekkasies vir dié wagwoord</value>
+    <value>Check known data breaches for this password</value>
   </data>
   <data name="ExposedMasterPassword" xml:space="preserve">
-    <value>Blootgestelde Hoofwagwoord</value>
+    <value>Exposed Master Password</value>
   </data>
   <data name="PasswordFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>Dié wagwoord was in data lekkasie gevind. Gebruik 'n unieke wagwoord om jou rekening te beskerm. Is jy seker dat jy 'n blootgestelde wagwoord wil gebruik?</value>
+    <value>Password found in a data breach. Use a unique password to protect your account. Are you sure you want to use an exposed password?</value>
   </data>
   <data name="WeakAndExposedMasterPassword" xml:space="preserve">
-    <value>Swak en Blootgestelde Hoofwagwoord</value>
+    <value>Weak and Exposed Master Password</value>
   </data>
   <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>Swak wagwoord geïdentifiseer en in 'n data lekkasie gevind. Gebruik 'n sterk en unieke wagwoord om jou rekening te beskerm. Is jy seker dat jy hierdie wagwoord wil gebruik?</value>
-  </data>
-  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Organisasie SSO identifiseerder vereis.</value>
-  </data>
-  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Voeg die sleutel by 'n huidige of nuwe item</value>
-  </data>
-  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>Daar is geen items in jou kluis wat met "{0}" ooreenstem nie</value>
-  </data>
-  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Soek vir 'n item of voeg 'n nuwe een by</value>
-  </data>
-  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>Daar is geen items wat met die soekterm ooreenstem nie</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>VS</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Selghehuisves</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Datastreek</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Streek</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>U hoofwagwoord voldoen nie aan een of meer van die organisasiebeleide nie. Om toegang tot die kluis te kry, moet u nou u hoofwagwoord bywerk. Deur voort te gaan sal u van u huidige sessie afgeteken word, en u sal weer moet aanteken. Aktiewe sessies op ander toestelle kan vir tot een uur aktief bly.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Huidige hoofwagwoord</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
+    <value>Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?</value>
   </data>
 </root>

src/App/Resources/AppResources.ar.resx

@@ -583,8 +583,8 @@
   <data name="MasterPasswordHintDescription" xml:space="preserve">
     <value>يمكن أن تساعدك فكرة كلمة المرور الرئيسية على تذكر كلمة المرور الخاصة بك إذا نسيت.</value>
   </data>
-  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>كلمة المرور الرئيسية يجب أن تكون على الأقل {0} حرفاً.</value>
+  <data name="MasterPasswordLengthValMessage" xml:space="preserve">
+    <value>يجب أن تكون كلمة المرور الرئيسية أكثر من 8 أحرف.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>الحد الأدنى للأرقام</value>
@@ -1752,11 +1752,11 @@
     <value>هل تريد حقاً أن ترسل إلى سلة المهملات؟</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>تم تعطيل فتح القفل الحيوي لهذا الحساب في انتظار التحقق من كلمة المرور الرئيسية.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>تم تعطيل فتح القفل الحيوي في انتظار التحقق من كلمة المرور الرئيسية.</value>
   </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>إلغاء القفل الحيوي للملء التلقائي لهذا الحساب معطل في انتظار التحقق من كلمة المرور الرئيسية.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>تم تعطيل إلغاء القفل البيومتري للملء التلقائي في انتظار التحقق من كلمة المرور الرئيسية.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>تمكين المزامنة عند التحديث</value>
@@ -2143,16 +2143,10 @@
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
     <value>سياسات مؤسستك تؤثر على مهلة الخزنة الخاص بك. الحد الأقصى المسموح به لمهلة الخزنة هو {0} ساعة و {1} دقيقة</value>
   </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>سياسات مؤسستك تؤثر على مهلة خزنتك. الحد الأقصى المسموح به لمهلة الخزنة هو {0} ساعة(ساعات) و {1} دقيقة(دقائق). يتم تعيين إجراء مهلة المخزن الخاص بك إلى {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>سياسات مؤسستك قامت بتعيين إجراء مهلة خزنتك إلى {0}.</value>
-  </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>مهلة خزنتك تتجاوز القيود التي تضعها مؤسستك.</value>
   </data>
-  <data name="DisablePersonalVaultExportPolicyInEffect" xml:space="preserve">
+  <data name="DisablePersonalVaultExportPolicyInEffect">
     <value>واحدة أو أكثر من سياسات المؤسسة تمنعك من تصدير خزانتك الشخصية.</value>
   </data>
   <data name="AddAccount" xml:space="preserve">
@@ -2496,8 +2490,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>احصل على تلميح كلمة المرور الرئيسية</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>تسجيل الدخول كـ {0} في {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>تسجيل الدخول كـ {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>ليس أنت؟</value>
@@ -2530,111 +2524,57 @@
     <value>هذا الطلب لم يعد صالحًا</value>
   </data>
   <data name="PendingLogInRequests" xml:space="preserve">
-    <value>طلبات تسجيل الدخول المعلقة</value>
+    <value>Pending login requests</value>
   </data>
   <data name="DeclineAllRequests" xml:space="preserve">
-    <value>رفض جميع الطلبات</value>
+    <value>Decline all requests</value>
   </data>
   <data name="AreYouSureYouWantToDeclineAllPendingLogInRequests" xml:space="preserve">
-    <value>هل أنت متأكد من أنك تريد رفض جميع طلبات تسجيل الدخول المعلقة؟</value>
+    <value>Are you sure you want to decline all pending login requests?</value>
   </data>
   <data name="RequestsDeclined" xml:space="preserve">
-    <value>تم رفض الطلبات</value>
+    <value>Requests declined</value>
   </data>
   <data name="NoPendingRequests" xml:space="preserve">
-    <value>لا توجد طلبات معلقة</value>  
+    <value>No pending requests</value>  
   </data>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
     <value>تمكين إذن الكاميرا لاستخدام الماسح الضوئي</value>
   </data>
-  <data name="Language" xml:space="preserve">
-    <value>اللّغة</value>
-  </data>
-  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>تم تغيير اللغة إلى {0}. الرجاء إعادة تشغيل التطبيق لرؤية التغيير</value>
-  </data>
-  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>تغيير اللّغة يتطلب إعادة تشغيل التطبيق</value>
-  </data>
-  <data name="DefaultSystem" xml:space="preserve">
-    <value>الافتراضي (النظام)</value>
-  </data>
   <data name="Important" xml:space="preserve">
-    <value>مهم</value>
+    <value>Important</value>
   </data>
   <data name="YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum" xml:space="preserve">
-    <value>لا يمكن استعادة كلمة المرور الرئيسية الخاصة بك إذا نسيت ذلك! {0} أحرف الحد الأدنى.</value>
+    <value>Your master password cannot be recovered if you forget it! {0} characters minimum.</value>
   </data>
   <data name="WeakMasterPassword" xml:space="preserve">
-    <value>كلمة المرور الرئيسية الضعيفة</value>
+    <value>Weak Master Password</value>
   </data>
   <data name="WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount" xml:space="preserve">
-    <value>تم تحديد كلمة المرور ضعيفة. استخدم كلمة مرور قوية لحماية حسابك. هل أنت متأكد من أنك تريد استخدام كلمة مرور ضعيفة؟</value>
+    <value>Weak password identified. Use a strong password to protect your account. Are you sure you want to use a weak password?</value>
   </data>
   <data name="Weak" xml:space="preserve">
-    <value>ضعيفة</value>
+    <value>Weak</value>
   </data>
   <data name="Good" xml:space="preserve">
-    <value>جيدة</value>
+    <value>Good</value>
   </data>
   <data name="Strong" xml:space="preserve">
-    <value>قوية</value>
+    <value>Strong</value>
   </data>
   <data name="CheckKnownDataBreachesForThisPassword" xml:space="preserve">
-    <value>تحقق من خروقات البيانات المعروفة لكلمة المرور هذه</value>
+    <value>Check known data breaches for this password</value>
   </data>
   <data name="ExposedMasterPassword" xml:space="preserve">
-    <value>كلمة المرور الرئيسية مكشوفة</value>
+    <value>Exposed Master Password</value>
   </data>
   <data name="PasswordFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>كلمة المرور موجودة في خرق البيانات. استخدم كلمة مرور فريدة لحماية حسابك. هل أنت متأكد من أنك تريد استخدام كلمة مرور مكشوفة؟</value>
+    <value>Password found in a data breach. Use a unique password to protect your account. Are you sure you want to use an exposed password?</value>
   </data>
   <data name="WeakAndExposedMasterPassword" xml:space="preserve">
-    <value>كلمة المرور الرئيسية ضعيفة ومكشوفة</value>
+    <value>Weak and Exposed Master Password</value>
   </data>
   <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>كلمة مرور ضعيفة محددة وموجودة في خرق البيانات. استخدم كلمة مرور قوية وفريدة لحماية حسابك. هل أنت متأكد من أنك تريد استخدام كلمة المرور هذه؟</value>
-  </data>
-  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>معرف الـSSO للمنظمة مطلوب.</value>
-  </data>
-  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>إضافة المفتاح إلى عنصر موجود أو جديد</value>
-  </data>
-  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>لا توجد عناصر في خزانتك تتطابق مع "{0}"</value>
-  </data>
-  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>البحث عن عنصر أو إضافة عنصر جديد</value>
-  </data>
-  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>لا توجد عناصر تطابق البحث</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>الولايات المتحدة</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>الاتحاد الأوروبي</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>استضافة ذاتية</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>منطقة البيانات</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>المنطقة</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>كلمة المرور الرئيسية الخاصة بك لا تفي بواحدة أو أكثر من سياسات مؤسستك. من أجل الوصول إلى الخزنة، يجب عليك تحديث كلمة المرور الرئيسية الآن. سيتم تسجيل خروجك من الجلسة الحالية، مما يتطلب منك تسجيل الدخول مرة أخرى. وقد تظل الجلسات النشطة على أجهزة أخرى نشطة لمدة تصل إلى ساعة واحدة.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>كلمة المرور الرئيسية الحالية</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
+    <value>Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?</value>
   </data>
 </root>

src/App/Resources/AppResources.az.resx

@@ -583,8 +583,8 @@
   <data name="MasterPasswordHintDescription" xml:space="preserve">
     <value>Ana parol məsləhəti, unutduğunuz parolu xatırlamağınıza kömək edir.</value>
   </data>
-  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Ana parol ən azı {0} simvol uzunluğunda olmalıdır.</value>
+  <data name="MasterPasswordLengthValMessage" xml:space="preserve">
+    <value>Ana parol ən azı 8 simvol uzunluğunda olmalıdır.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>Minimum rəqəm</value>
@@ -1752,11 +1752,11 @@ Skan prosesi avtomatik baş tutacaq.</value>
     <value>Həqiqətən tullantı qutusuna göndərmək istəyirsiniz?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün bu hesab üzrə biometrik kilid açma sıradan çıxarıldı.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün biometrik kilid açma sıradan çıxarıldı.</value>
   </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün bu hesab üzrə avto-doldurma biometrik kilid açma sıradan çıxarıldı.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün avto-doldurma üzrə biometrik kilid açma sıradan çıxarıldı.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Təzələmə əsnasında eyniləşdirməni fəallaşdır</value>
@@ -2142,16 +2142,10 @@ Skan prosesi avtomatik baş tutacaq.</value>
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
     <value>Təşkilatınızın siyasətləri, anbarınızın vaxt bitişinə təsir edir. Anbar vaxt bitişi üçün icazə verilən maksimum vaxt {0} saat {1} dəqiqədir</value>
   </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Təşkilatınızın siyasətləri, anbarınızın vaxt bitişinə təsir edir. Anbar vaxt bitişi üçün icazə verilən maksimum vaxt {0} saat {1} dəqiqədir. Anbar vaxt bitişi əməliyyatı {2} olaraq tənzimləndi.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Təşkilatınızın siyasətləri, anbar vaxt bitişi əməliyyatınızı {0} olaraq tənzimlədi.</value>
-  </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>Anbar vaxt bitişi, təşkilatınız tərəfindən tənzimlənən məhdudiyyətləri aşır.</value>
   </data>
-  <data name="DisablePersonalVaultExportPolicyInEffect" xml:space="preserve">
+  <data name="DisablePersonalVaultExportPolicyInEffect">
     <value>Bir və ya daha çox təşkilat siyasəti, fərdi anbarınızı ixrac etməyinizin qarşısını alır.</value>
   </data>
   <data name="AddAccount" xml:space="preserve">
@@ -2494,8 +2488,8 @@ Bu hesaba keçmək istəyirsiniz?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Ana parol üçün məsləhət alın</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{1} üzərində {0} olaraq giriş edildi</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} olaraq giriş edilir</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Siz deyilsiniz?</value>
@@ -2545,18 +2539,6 @@ Bu hesaba keçmək istəyirsiniz?</value>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
     <value>Skaneri istifadə etmək üçün kamera icazəsini fəallaşdırın</value>
   </data>
-  <data name="Language" xml:space="preserve">
-    <value>Dil</value>
-  </data>
-  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>Dil, {0} olaraq dəyişdirildi. Dəyişiklikləri görmək üçün zəhmət olmasa tətbiqi yenidən başladın</value>
-  </data>
-  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Dil dəyişikliyi, tətbiqin yenidən başladılmasını tələb edir</value>
-  </data>
-  <data name="DefaultSystem" xml:space="preserve">
-    <value>İlkin (Sistem)</value>
-  </data>
   <data name="Important" xml:space="preserve">
     <value>Vacib</value>
   </data>
@@ -2593,46 +2575,4 @@ Bu hesaba keçmək istəyirsiniz?</value>
   <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
     <value>Zəif parol məlumat pozuntusunda aşkarlandı və tapıldı. Hesabınızı qorumaq üçün güclü və unikal bir parol istifadə edin. Bu parolu istifadə etmək istədiyinizə əminsiniz?</value>
   </data>
-  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Təşkilat SSO identifikatoru tələb olundu.</value>
-  </data>
-  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Açarı, mövcud və ya yeni bir elementə əlavə edin</value>
-  </data>
-  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>Anbarınızda {0} ilə uyğunlaşan heç bir element yoxdur</value>
-  </data>
-  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Bir element axtarın və ya yenisini əlavə edin</value>
-  </data>
-  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>Axtarışa uyğun gələn heç bir element yoxdur</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>ABŞ</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>AB</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Öz-özünə sahiblik edən</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data bölgəsi</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Bölgə</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Ana parolunuz təşkilatınızdakı siyasətlərdən birinə və ya bir neçəsinə uyğun gəlmir. Anbara müraciət üçün ana parolunuzu indi güncəlləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Hazırkı ana parol</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Ana parolu təkrar soruş köməyi</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.be.resx

@@ -583,8 +583,8 @@
   <data name="MasterPasswordHintDescription" xml:space="preserve">
     <value>Падказка да асноўнага пароля можа дапамагчы вам успомніць яго, калі вы яго забылі.</value>
   </data>
-  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Асноўны пароль павінен змяшчаць прынамсі {0} сімвалаў.</value>
+  <data name="MasterPasswordLengthValMessage" xml:space="preserve">
+    <value>Асноўны пароль павінен змяшчаць прынамсі 8 сімвалаў.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>Мінімум лічбаў</value>
@@ -1751,11 +1751,11 @@
     <value>Вы сапраўды хочаце адправіць элемент у сметніцу?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Разблакіроўка па біяметрыі для гэтага ўліковага запісу адключана. Чакаецца праверка асноўным паролем.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Разблакіраванне па біяметрыі адключана. Чакаецца праверка асноўным паролем.</value>
   </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Аўтазапаўненне з дапамогай разблакіроўкі па біяметрыі для гэтага ўліковага запісу адключана. Чакаецца праверка асноўным паролем.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Разблакіраванне па біяметрыі для аўтазапаўнення адключана. Чакаецца праверка асноўным паролем.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Уключыць сінхранізацыю пры абнаўленні</value>
@@ -2142,16 +2142,10 @@
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
     <value>Палітыка вашай арганізацыі ўплывае на час чакання сховішча. Максімальны дазволены час чакання сховішча складае {0} гадз. і {1} хв.</value>
   </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Палітыка вашай арганізацыі ўплывае на час чакання сховішча. Максімальны дазволены час чакання сховішча складае гадзін: {0}; хвілін: {1}. Для часу чакання вашага сховішча прызначана дзеянне {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Палітыкай вашай арганізацыі прызначана дзеянне {0} для часу чакання вашага сховішча.</value>
-  </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>Час чакання вашага сховішча перавышае дазволеныя абмежаванні, якія прызначыла ваша арганізацыя.</value>
   </data>
-  <data name="DisablePersonalVaultExportPolicyInEffect" xml:space="preserve">
+  <data name="DisablePersonalVaultExportPolicyInEffect">
     <value>Адна або больш палітык арганізацыі не дазваляюць вам экспартаваць асабістае сховішча.</value>
   </data>
   <data name="AddAccount" xml:space="preserve">
@@ -2495,8 +2489,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Атрымаць падказку да асноўнага пароля</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Вы ўваходзіце як {0} у {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Увайсці як {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Не вы?</value>
@@ -2546,18 +2540,6 @@
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
     <value>Каб выкарыстоўваць сканер дайце дазвол на выкарыстанне камеры</value>
   </data>
-  <data name="Language" xml:space="preserve">
-    <value>Мова</value>
-  </data>
-  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>Мова была зменена на {0}. Перазапусціце праграму, каб убачыць змены</value>
-  </data>
-  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Для змены мовы неабходна перазапусціць праграму</value>
-  </data>
-  <data name="DefaultSystem" xml:space="preserve">
-    <value>Прадвызначана (сістэмная)</value>
-  </data>
   <data name="Important" xml:space="preserve">
     <value>Важна</value>
   </data>
@@ -2594,46 +2576,4 @@
   <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
     <value>Вызначаны ненадзейны пароль, які знойдзены ва ўцечках даных. Выкарыстоўвайце надзейныя і ўнікальныя паролі для абароны свайго ўліковага запісу. Вы сапраўды хочаце выкарыстоўваць гэты пароль?</value>
   </data>
-  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Неабходны ідэнтыфікатар SSO арганізацыі.</value>
-  </data>
-  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Дадаць ключ да існуючага або новага элемента</value>
-  </data>
-  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>У вашым сховішчы адсутнічаюць элементы, якія адпавядаюць "{0}"</value>
-  </data>
-  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Пошук або дабаўленне новага элемента</value>
-  </data>
-  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>Адсутнічаюць элементы, якія адпавядаюць пошуку</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>ЗША</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ЕС</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Уласнае размяшчэнне</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Рэгіён даных</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Рэгіён</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Ваш асноўны пароль не адпавядае адной або некалькім палітыкам арганізацыі. Для атрымання доступу да сховішча, вы павінны абнавіць яго. Працягваючы, вы выйдзіце з бягучага сеанса і вам неабходна будзе ўвайсці паўторна. Актыўныя сеансы на іншых прыладах могуць заставацца актыўнымі на працягу адной гадзіны.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Бягучы асноўны пароль</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Дапамога з паўторным запытам асноўнага пароля</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Па прычыне недахопу памяці можа адбыцца збой разблакіроўкі. Паменшыце налады памяці KDF, каб вырашыць гэту праблему</value>
-  </data>
 </root>

src/App/Resources/AppResources.bg.resx

@@ -583,8 +583,8 @@
   <data name="MasterPasswordHintDescription" xml:space="preserve">
     <value>Подсказката помага да си спомните паролата, ако сте я забравили.</value>
   </data>
-  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Главната парола трябва да е дълга поне {0} знака.</value>
+  <data name="MasterPasswordLengthValMessage" xml:space="preserve">
+    <value>Главната парола трябва да е дълга поне 8 знака.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>Минимален брой цифри</value>
@@ -1752,11 +1752,11 @@
     <value>Сигурни ли сте, че искате да преместите записа в кошчето?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Потвърждаването с биометрични данни е изключено за тази регистрация. Въведете главната парола, за да го включите.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Засечена е промяна в биометричните данни. Впишете се с главната парола, за да я включите отново биометричната идентификация.</value>
   </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Автоматичното попълване за потвърждаване с биометрични данни е изключено за тази регистрация. Въведете главната парола, за да го включите.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Потвърждаването с биометрични данни е изключено. Въведете главната парола, за да го включите.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Синхронизация при опресняване</value>
@@ -2083,10 +2083,11 @@
     <value>Това действие е защитено. За да продължите, въведете отново главната си парола, за да потвърдите самоличността си.</value>
   </data>
   <data name="CaptchaRequired" xml:space="preserve">
-    <value>Проверката е задължителна</value>
+    <value>Адресът за hCaptcha е задължителен</value>
   </data>
   <data name="CaptchaFailed" xml:space="preserve">
-    <value>Грешка. Опитайте отново.</value>
+    <value>
+Грешка. Моля опитайте пак</value>
   </data>
   <data name="UpdatedMasterPassword" xml:space="preserve">
     <value>Главната парола е променена</value>
@@ -2142,16 +2143,10 @@
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
     <value>Настройките на организацията Ви влияят върху времето за достъп до трезора Ви. Максималното разрешено време за достъп е {0} час(а) и {1} минути</value>
   </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Настройките на организацията Ви влияят върху времето за достъп до трезора Ви. Максималното разрешено време за достъп е {0} час(а) и {1} минута/и. Зададеното действие при изтичане на това време е {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Настройките на организацията Ви задават следното действие при изтичане на времето за достъп до трезора: {0}.</value>
-  </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>Времето за достъп до трезора Ви превишава ограничението, определено от организацията Ви.</value>
   </data>
-  <data name="DisablePersonalVaultExportPolicyInEffect" xml:space="preserve">
+  <data name="DisablePersonalVaultExportPolicyInEffect">
     <value>Една или повече от настройките на организацията Ви не позволяват да изнасяте личния си трезор.</value>
   </data>
   <data name="AddAccount" xml:space="preserve">
@@ -2299,10 +2294,10 @@
     <value>Ръчно въвеждане на кода</value>
   </data>
   <data name="AddTotp" xml:space="preserve">
-    <value>Добавяне на TOTP</value>
+    <value>Копиране на кода за потвърждаване</value>
   </data>
   <data name="SetupTotp" xml:space="preserve">
-    <value>Настройка на TOTP</value>
+    <value>Копиране на кода за потвърждаване</value>
   </data>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Once the key is successfully entered,
@@ -2495,8 +2490,8 @@ select Add TOTP to store the key safely</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Получете подсказване за главната парола</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Влизате като {0} в {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Вписване като {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Това не сте Вие?</value>
@@ -2546,18 +2541,6 @@ select Add TOTP to store the key safely</value>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
     <value>Разрешете достъпа до камерата, за да използвате скенера</value>
   </data>
-  <data name="Language" xml:space="preserve">
-    <value>Език</value>
-  </data>
-  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>Езикът беше променен на {0}. Рестартирайте приложението, за да влезе промяната в сила</value>
-  </data>
-  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Промяната на езика изисква рестартиране на приложението</value>
-  </data>
-  <data name="DefaultSystem" xml:space="preserve">
-    <value>По подразбиране (от системата)</value>
-  </data>
   <data name="Important" xml:space="preserve">
     <value>Важно</value>
   </data>
@@ -2594,46 +2577,4 @@ select Add TOTP to store the key safely</value>
   <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
     <value>Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?</value>
   </data>
-  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Идентификаторът за еднократн идентификация на организация е задължителен.</value>
-  </data>
-  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Добавяне на ключа към съществуващ или нов елемент</value>
-  </data>
-  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>В трезора липсват елементи, които отговарят на „{0}“</value>
-  </data>
-  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Търсене на елемент или добавяне на нов</value>
-  </data>
-  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>Няма елементи, които отговарят на търсенето</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>САЩ</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ЕС</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Собствен хостинг</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Регион на данните</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Регион</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Вашата главна парола не отговаря на една или повече политики на организацията Ви. За да получите достъп до трезора, трябва да промените главната си парола сега. Това означава, че ще бъдете отписан(а) от текущата си сесия и ще трябва да се впишете отново. Активните сесии на други устройства може да продължат да бъдат активни още един час.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Текуща главна парола</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Помощ за повторното запитване за главната парола</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Отключването може да бъде неуспешно заради недостатъчно памет. Намалете настройките на паметта за KDF, за да разрешите проблема.</value>
-  </data>
 </root>

src/App/Resources/AppResources.bn.resx

@@ -160,7 +160,7 @@
     <comment>The button text that allows a user to copy the login's username to their clipboard.</comment>
   </data>
   <data name="Credits" xml:space="preserve">
-    <value>কৃতিত্ব</value>
+    <value>Credits</value>
     <comment>Title for page that we use to give credit to resources that we use.</comment>
   </data>
   <data name="Delete" xml:space="preserve">
@@ -168,11 +168,11 @@
     <comment>Delete an entity (verb).</comment>
   </data>
   <data name="Deleting" xml:space="preserve">
-    <value>মোছা হচ্ছে...</value>
+    <value>Deleting...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="DoYouReallyWantToDelete" xml:space="preserve">
-    <value>আপনি কি সত্যিই মুছে ফেলতে চান? এটিকে পূর্বের মত করা যাবে না।.</value>
+    <value>Do you really want to delete? This cannot be undone.</value>
     <comment>Confirmation alert message when deleteing something.</comment>
   </data>
   <data name="Edit" xml:space="preserve">
@@ -190,16 +190,16 @@
     <comment>Full label for a email address.</comment>
   </data>
   <data name="EmailUs" xml:space="preserve">
-    <value>আমাদের ইমেইল করুন</value>
+    <value>Email us</value>
   </data>
   <data name="EmailUsDescription" xml:space="preserve">
-    <value>সাহায্য পেতে বা মতামত দিতে সরাসরি আমাদের ইমেল করুন।</value>
+    <value>Email us directly to get help or leave feedback.</value>
   </data>
   <data name="EnterPIN" xml:space="preserve">
-    <value>আপনার পিন কোডটি প্রবেশ করান</value>
+    <value>Enter your PIN code.</value>
   </data>
   <data name="Favorites" xml:space="preserve">
-    <value>পছন্দসমূহ</value>
+    <value>Favorites</value>
     <comment>Title for your favorite items in the vault.</comment>
   </data>
   <data name="FileBugReport" xml:space="preserve">
@@ -216,7 +216,7 @@
     <comment>Label for a folder.</comment>
   </data>
   <data name="FolderCreated" xml:space="preserve">
-    <value>নতুন ফোল্ডার তৈরি হয়েছে।</value>
+    <value>New folder created.</value>
   </data>
   <data name="FolderDeleted" xml:space="preserve">
     <value>Folder deleted.</value>
@@ -276,7 +276,7 @@
     <value>আপনি লগ আউট করতে চান?</value>
   </data>
   <data name="RemoveAccount" xml:space="preserve">
-    <value>অ্যাকাউন্ট অপসারণ করুন</value>
+    <value>Remove account</value>
   </data>
   <data name="RemoveAccountConfirmation" xml:space="preserve">
     <value>Are you sure you want to remove this account?</value>
@@ -315,30 +315,30 @@
     <comment>Label for notes.</comment>
   </data>
   <data name="Ok" xml:space="preserve">
-    <value>ঠিক আছে</value>
+    <value>Ok</value>
     <comment>Acknowledgement.</comment>
   </data>
   <data name="Password" xml:space="preserve">
-    <value>পাসওয়ার্ড</value>
+    <value>Password</value>
     <comment>Label for a password.</comment>
   </data>
   <data name="Save" xml:space="preserve">
-    <value>সংরক্ষণ করুন</value>
+    <value>Save</value>
     <comment>Button text for a save operation (verb).</comment>
   </data>
   <data name="Move" xml:space="preserve">
-    <value>স্থানান্তর করুন</value>
+    <value>Move</value>
   </data>
   <data name="Saving" xml:space="preserve">
     <value>Saving...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="Settings" xml:space="preserve">
-    <value>সেটিংস</value>
+    <value>Settings</value>
     <comment>The title for the settings page.</comment>
   </data>
   <data name="Show" xml:space="preserve">
-    <value>দেখান</value>
+    <value>Show</value>
     <comment>Reveal a hidden value (password).</comment>
   </data>
   <data name="ItemDeleted" xml:space="preserve">
@@ -346,17 +346,17 @@
     <comment>Confirmation message after successfully deleting a login.</comment>
   </data>
   <data name="Submit" xml:space="preserve">
-    <value>জমা দিন</value>
+    <value>Submit</value>
   </data>
   <data name="Sync" xml:space="preserve">
     <value>Sync</value>
     <comment>The title for the sync page.</comment>
   </data>
   <data name="ThankYou" xml:space="preserve">
-    <value>ধন্যবাদ</value>
+    <value>Thank you</value>
   </data>
   <data name="Tools" xml:space="preserve">
-    <value>টুলস</value>
+    <value>Tools</value>
     <comment>The title for the tools page.</comment>
   </data>
   <data name="URI" xml:space="preserve">
@@ -379,7 +379,7 @@
     <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
-    <value>আঙ্গুলের ছাপ যাচাই করুন</value>
+    <value>Verify fingerprint</value>
   </data>
   <data name="VerifyMasterPassword" xml:space="preserve">
     <value>প্রধান পাসওয়ার্ড যাচাইকরণ</value>
@@ -388,32 +388,32 @@
     <value>Verify PIN</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>সংস্করণ</value>
+    <value>Version</value>
   </data>
   <data name="View" xml:space="preserve">
     <value>View</value>
   </data>
   <data name="VisitOurWebsite" xml:space="preserve">
-    <value>আমাদের ওয়েবসাইটে ঢু মেরে আসুন</value>
+    <value>Visit our website</value>
   </data>
   <data name="VisitOurWebsiteDescription" xml:space="preserve">
-    <value>সাহায্য পেতে, খবর পেতে, আমাদের ইমেল করতে এবং/অথবা বিটওয়ার্ডেন কীভাবে ব্যবহার করবেন সে সম্পর্কে আরও জানতে আমাদের ওয়েবসাইট দেখুন।</value>
+    <value>Visit our website to get help, news, email us, and/or learn more about how to use Bitwarden.</value>
   </data>
   <data name="Website" xml:space="preserve">
-    <value>ওয়েবসাইট</value>
+    <value>Website</value>
     <comment>Label for a website.</comment>
   </data>
   <data name="Yes" xml:space="preserve">
-    <value>হ্যাঁ</value>
+    <value>Yes</value>
   </data>
   <data name="Account" xml:space="preserve">
-    <value>অ্যাকাউন্ট</value>
+    <value>Account</value>
   </data>
   <data name="AccountCreated" xml:space="preserve">
-    <value>আপনার নতুন অ্যাকাউন্ট তৈরি করা হয়েছে! আপনি এখন লগইন করতে পারবেন।</value>
+    <value>Your new account has been created! You may now log in.</value>
   </data>
   <data name="AddAnItem" xml:space="preserve">
-    <value>একটি আইটেম যোগ করুন</value>
+    <value>Add an Item</value>
   </data>
   <data name="AppExtension" xml:space="preserve">
     <value>App extension</value>
@@ -425,7 +425,7 @@
     <value>Auto-fill service</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
-    <value>অস্পষ্ট বর্ণগুলি বাদ দিয়ে যান</value>
+    <value>Avoid ambiguous characters</value>
   </data>
   <data name="BitwardenAppExtension" xml:space="preserve">
     <value>Bitwarden app extension</value>
@@ -440,13 +440,13 @@
     <value>Bitwarden Auto-fill Service</value>
   </data>
   <data name="BitwardenAutofillAccessibilityServiceDescription" xml:space="preserve">
-    <value>আপনার লগইনগুলি স্বয়ংক্রিয়ভাবে পূরণ করতে বিটওয়ার্ডেন অ্যাক্সেসিবিলিটি পরিষেবা ব্যবহার করুন৷</value>
+    <value>Use the Bitwarden accessibility service to auto-fill your logins.</value>
   </data>
   <data name="ChangeEmail" xml:space="preserve">
-    <value>ইমেইল পরিবর্তন করুন</value>
+    <value>Change email</value>
   </data>
   <data name="ChangeEmailConfirmation" xml:space="preserve">
-    <value>আপনি bitwarden.com ওয়েব ভল্টে আপনার ইমেল ঠিকানা পরিবর্তন করতে পারেন। আপনি কি এখনই ওয়েবসাইট ভিজিট করতে চান?</value>
+    <value>You can change your email address on the bitwarden.com web vault. Do you want to visit the website now?</value>
   </data>
   <data name="ChangeMasterPassword" xml:space="preserve">
     <value>প্রধান পাসওয়ার্ড পরিবর্তন</value>
@@ -455,7 +455,7 @@
     <value>আপনি bitwarden.com ওয়েব ভল্ট থেকে প্রধান পাসওয়ার্ডটি পরিবর্তন করতে পারেন। আপনি কি এখনই ওয়েবসাইটটি দেখতে চান?</value>
   </data>
   <data name="Close" xml:space="preserve">
-    <value>বন্ধ করুন</value>
+    <value>Close</value>
   </data>
   <data name="Continue" xml:space="preserve">
     <value>অবিরত</value>
@@ -480,7 +480,7 @@
     <value>Reactivate app extension</value>
   </data>
   <data name="ExtensionAlmostDone" xml:space="preserve">
-    <value>প্রায় হয়ে গেছে!</value>
+    <value>Almost done!</value>
   </data>
   <data name="ExtensionEnable" xml:space="preserve">
     <value>Activate app extension</value>
@@ -493,7 +493,7 @@
     <value>Get instant access to your passwords!</value>
   </data>
   <data name="ExtensionReady" xml:space="preserve">
-    <value>আপনি লগইন করার জন্য একদম তৈরি!</value>
+    <value>You're ready to log in!</value>
   </data>
   <data name="ExtensionSetup" xml:space="preserve">
     <value>Your logins are now easily accessible from Safari, Chrome, and other supported apps.</value>
@@ -511,7 +511,7 @@
     <value>প্রিয়</value>
   </data>
   <data name="Fingerprint" xml:space="preserve">
-    <value>আঙুলের ছাপ</value>
+    <value>Fingerprint</value>
   </data>
   <data name="GeneratePassword" xml:space="preserve">
     <value>পাসওয়ার্ড তৈরি করুন</value>
@@ -583,8 +583,8 @@
   <data name="MasterPasswordHintDescription" xml:space="preserve">
     <value>যদি আপনি আপনার পাসওয়ার্ড ভুলে যান তাহলে একটি প্রধান পাসওয়ার্ডের ইঙ্গিতটি আপনাকে মনে করাতে সাহায্য করতে পারে।</value>
   </data>
-  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>মাস্টার পাসওয়ার্ড কমপক্ষে {0} অক্ষরের হতে হবে।</value>
+  <data name="MasterPasswordLengthValMessage" xml:space="preserve">
+    <value>প্রধান পাসওয়ার্ড কমপক্ষে ৮ অক্ষর দীর্ঘ হওয়া উচিত।</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>সর্বনিম্ন সংখ্যা</value>
@@ -595,7 +595,7 @@
     <comment>Minimum special characters for password generator settings</comment>
   </data>
   <data name="MoreSettings" xml:space="preserve">
-    <value>আরও সেটিংস</value>
+    <value>More settings</value>
   </data>
   <data name="MustLogInMainApp" xml:space="preserve">
     <value>You must log into the main Bitwarden app before you can use the extension.</value>
@@ -651,7 +651,7 @@
     <comment>Push notifications for apple products</comment>
   </data>
   <data name="RateTheApp" xml:space="preserve">
-    <value>অ্যাপ্লিকেশনটকে রেট দিন</value>
+    <value>Rate the app</value>
   </data>
   <data name="RateTheAppDescription" xml:space="preserve">
     <value>দয়া করে একটি ভাল পর্যালোচনার মাধ্যমে সাহায্য করতে আমাদের বিবেচনা করুন!</value>
@@ -684,7 +684,7 @@
     <value>Item saved</value>
   </data>
   <data name="Submitting" xml:space="preserve">
-    <value>জমা দেওয়া হচ্ছে...</value>
+    <value>Submitting...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="Syncing" xml:space="preserve">
@@ -701,7 +701,7 @@
     <value>Sync vault now</value>
   </data>
   <data name="TouchID" xml:space="preserve">
-    <value>টাচ আইডি</value>
+    <value>Touch ID</value>
     <comment>What Apple calls their fingerprint reader.</comment>
   </data>
   <data name="TwoStepLogin" xml:space="preserve">
@@ -717,17 +717,17 @@
     <value>Unlock with PIN code</value>
   </data>
   <data name="Validating" xml:space="preserve">
-    <value>কার্যকর করা হচ্ছে</value>
+    <value>Validating</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="VerificationCode" xml:space="preserve">
-    <value>যাচাইকরণ কোড</value>
+    <value>Verification code</value>
   </data>
   <data name="ViewItem" xml:space="preserve">
     <value>View item</value>
   </data>
   <data name="WebVault" xml:space="preserve">
-    <value>বিটওয়ার্ডেন ওয়েব ভল্ট</value>
+    <value>Bitwarden web vault</value>
   </data>
   <data name="Lost2FAApp" xml:space="preserve">
     <value>Lost authenticator app?</value>
@@ -740,10 +740,10 @@
     <value>Extension activated!</value>
   </data>
   <data name="Icons" xml:space="preserve">
-    <value>আইকন</value>
+    <value>Icons</value>
   </data>
   <data name="Translations" xml:space="preserve">
-    <value>অনুবাদসমূহ</value>
+    <value>Translations</value>
   </data>
   <data name="ItemsForUri" xml:space="preserve">
     <value>Items for {0}</value>
@@ -769,19 +769,19 @@
     <value>2. Switch on the toggle and press OK to accept.</value>
   </data>
   <data name="Disabled" xml:space="preserve">
-    <value>নিষ্ক্রিয়</value>
+    <value>Disabled</value>
   </data>
   <data name="Enabled" xml:space="preserve">
-    <value>সক্রিয়</value>
+    <value>Enabled</value>
   </data>
   <data name="Off" xml:space="preserve">
-    <value>বন্ধ</value>
+    <value>Off</value>
   </data>
   <data name="On" xml:space="preserve">
-    <value>চালু</value>
+    <value>On</value>
   </data>
   <data name="Status" xml:space="preserve">
-    <value>অবস্থা</value>
+    <value>Status</value>
   </data>
   <data name="BitwardenAutofillServiceAlert2" xml:space="preserve">
     <value>The easiest way to add new logins to your vault is from the Bitwarden Auto-fill Service. Learn more about using the Bitwarden Auto-fill Service by navigating to the "Settings" screen.</value>
@@ -876,7 +876,7 @@
     <value>Unable to download file.</value>
   </data>
   <data name="UnableToOpenFile" xml:space="preserve">
-    <value>আপনার ডিভাইস এই ধরনের ফাইল খুলতে পারে না।</value>
+    <value>Your device cannot open this type of file.</value>
   </data>
   <data name="Downloading" xml:space="preserve">
     <value>ডাউনলোড হচ্ছে...</value>
@@ -904,13 +904,13 @@
 Scanning will happen automatically.</value>
   </data>
   <data name="ScanQrTitle" xml:space="preserve">
-    <value>QR কোড স্ক্যান করুন</value>
+    <value>Scan QR Code</value>
   </data>
   <data name="Camera" xml:space="preserve">
-    <value>ক্যামেরা</value>
+    <value>Camera</value>
   </data>
   <data name="Photos" xml:space="preserve">
-    <value>ছবিসমূহ</value>
+    <value>Photos</value>
   </data>
   <data name="CopyTotp" xml:space="preserve">
     <value>Copy TOTP</value>
@@ -934,7 +934,7 @@ Scanning will happen automatically.</value>
     <value>Choose file</value>
   </data>
   <data name="File" xml:space="preserve">
-    <value>ফাইল</value>
+    <value>File</value>
   </data>
   <data name="NoFileChosen" xml:space="preserve">
     <value>No file chosen</value>
@@ -1080,7 +1080,7 @@ Scanning will happen automatically.</value>
     <value>নামের শেষাংশ</value>
   </data>
   <data name="FullName" xml:space="preserve">
-    <value>পুরো নাম</value>
+    <value>Full name</value>
   </data>
   <data name="LicenseNumber" xml:space="preserve">
     <value>লাইসেন্স নম্বর</value>
@@ -1107,34 +1107,34 @@ Scanning will happen automatically.</value>
     <value>Mx</value>
   </data>
   <data name="November" xml:space="preserve">
-    <value>নভেম্বর</value>
+    <value>November</value>
   </data>
   <data name="October" xml:space="preserve">
-    <value>অক্টোবর</value>
+    <value>October</value>
   </data>
   <data name="PassportNumber" xml:space="preserve">
-    <value>পাসপোর্ট নম্বর</value>
+    <value>Passport number</value>
   </data>
   <data name="Phone" xml:space="preserve">
-    <value>ফোন</value>
+    <value>Phone</value>
   </data>
   <data name="September" xml:space="preserve">
-    <value>সেপ্টেম্বর</value>
+    <value>September</value>
   </data>
   <data name="SSN" xml:space="preserve">
-    <value>সামাজিক সুরক্ষা নম্বর</value>
+    <value>Social Security number</value>
   </data>
   <data name="StateProvince" xml:space="preserve">
-    <value>রাজ্য / প্রদেশ</value>
+    <value>State / Province</value>
   </data>
   <data name="Title" xml:space="preserve">
-    <value>শিরোনাম</value>
+    <value>Title</value>
   </data>
   <data name="ZipPostalCode" xml:space="preserve">
-    <value>জিপ / পোস্টকোড</value>
+    <value>Zip / Postal code</value>
   </data>
   <data name="Address" xml:space="preserve">
-    <value>ঠিকানা</value>
+    <value>Address</value>
   </data>
   <data name="Expiration" xml:space="preserve">
     <value>Expiration</value>
@@ -1204,7 +1204,7 @@ Scanning will happen automatically.</value>
     <value>Custom field name</value>
   </data>
   <data name="FieldTypeBoolean" xml:space="preserve">
-    <value>বুলিয়ান</value>
+    <value>Boolean</value>
   </data>
   <data name="FieldTypeHidden" xml:space="preserve">
     <value>Hidden</value>
@@ -1225,7 +1225,7 @@ Scanning will happen automatically.</value>
     <value>Remove</value>
   </data>
   <data name="NewUri" xml:space="preserve">
-    <value>নতুন URI</value>
+    <value>New URI</value>
   </data>
   <data name="URIPosition" xml:space="preserve">
     <value>URI {0}</value>
@@ -1272,7 +1272,7 @@ Scanning will happen automatically.</value>
     <value>Hold your Yubikey near the top of the device.</value>
   </data>
   <data name="TryAgain" xml:space="preserve">
-    <value>আবার চেষ্টা করুন</value>
+    <value>Try again</value>
   </data>
   <data name="YubiKeyInstructionIos" xml:space="preserve">
     <value>To continue, hold your YubiKey NEO against the back of the device.</value>
@@ -1440,16 +1440,16 @@ Scanning will happen automatically.</value>
     <value>Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved.</value>
   </data>
   <data name="NumberOfWords" xml:space="preserve">
-    <value>শব্দসংখ্যা</value>
+    <value>Number of words</value>
   </data>
   <data name="Passphrase" xml:space="preserve">
-    <value>গুপ্ত-বাক্যাংশ</value>
+    <value>Passphrase</value>
   </data>
   <data name="WordSeparator" xml:space="preserve">
-    <value>শব্দ বিভাজক</value>
+    <value>Word separator</value>
   </data>
   <data name="Clear" xml:space="preserve">
-    <value>পরিষ্কার করুন</value>
+    <value>Clear</value>
     <comment>To clear something out. example: To clear browser history.</comment>
   </data>
   <data name="Generator" xml:space="preserve">
@@ -1474,42 +1474,42 @@ Scanning will happen automatically.</value>
     <value>Export vault</value>
   </data>
   <data name="LockNow" xml:space="preserve">
-    <value>এখনই লক করুন</value>
+    <value>Lock now</value>
   </data>
   <data name="PIN" xml:space="preserve">
-    <value>পিন</value>
+    <value>PIN</value>
   </data>
   <data name="Unlock" xml:space="preserve">
-    <value>আনলক করুন</value>
+    <value>Unlock</value>
   </data>
   <data name="UnlockVault" xml:space="preserve">
     <value>Unlock vault</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>৩০ মিনিট</value>
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
-    <value>Bitwarden আনলক করার জন্য আপনার পিন কোডটি সেট করুন। আপনি যদি অ্যাপ্লিকেশনটি থেকে পুরোপুরি লগ আউট করেন তবে আপনার পিন সেটিংস রিসেট করা হবে।</value>
+    <value>Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application.</value>
   </data>
   <data name="LoggedInAsOn" xml:space="preserve">
-    <value>{1}-এ {0} হিসেবে লগইন করা হয়েছে।</value>
+    <value>Logged in as {0} on {1}.</value>
     <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
   </data>
   <data name="VaultLockedMasterPassword" xml:space="preserve">
     <value>আপনার ভল্ট লক করা আছে। চালিয়ে যেতে আপনার প্রধান পাসওয়ার্ডটি যাচাই করান।</value>
   </data>
   <data name="VaultLockedPIN" xml:space="preserve">
-    <value>আপনার ভল্ট লক করা আছে। চালিয়ে যেতে আপনার পিন কোড যাচাই করান।</value>
+    <value>Your vault is locked. Verify your PIN code to continue.</value>
   </data>
   <data name="VaultLockedIdentity" xml:space="preserve">
-    <value>আপনার ভল্ট লক করা আছে। চালিয়ে যেতে আপনার পরিচয় যাচাই করান।</value>
+    <value>Your vault is locked. Verify your identity to continue.</value>
   </data>
   <data name="Dark" xml:space="preserve">
-    <value>গাঢ়</value>
+    <value>Dark</value>
     <comment>A dark color</comment>
   </data>
   <data name="Light" xml:space="preserve">
-    <value>উজ্জ্বল</value>
+    <value>Light</value>
     <comment>A light color</comment>
   </data>
   <data name="FiveMinutes" xml:space="preserve">
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
     <value>Do you really want to send to the trash?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
   </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Allow sync on refresh</value>
@@ -1887,10 +1887,10 @@ Scanning will happen automatically.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="Text" xml:space="preserve">
-    <value>লেখা</value>
+    <value>Text</value>
   </data>
   <data name="TypeText" xml:space="preserve">
-    <value>লেখা</value>
+    <value>Text</value>
   </data>
   <data name="TypeTextInfo" xml:space="preserve">
     <value>The text you want to send.</value>
@@ -1900,7 +1900,7 @@ Scanning will happen automatically.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="TypeFile" xml:space="preserve">
-    <value>ফাইল</value>
+    <value>File</value>
   </data>
   <data name="TypeFileInfo" xml:space="preserve">
     <value>The file you want to send.</value>
@@ -1918,7 +1918,7 @@ Scanning will happen automatically.</value>
     <value>Text type is not selected, tap to select.</value>
   </data>
   <data name="DeletionDate" xml:space="preserve">
-    <value>মুছে ফেলার তারিখ</value>
+    <value>Deletion date</value>
   </data>
   <data name="DeletionTime" xml:space="preserve">
     <value>Deletion time</value>
@@ -1957,7 +1957,7 @@ Scanning will happen automatically.</value>
     <value>Current access count</value>
   </data>
   <data name="NewPassword" xml:space="preserve">
-    <value>নতুন পাসওয়ার্ড</value>
+    <value>New password</value>
   </data>
   <data name="PasswordInfo" xml:space="preserve">
     <value>Optionally require a password for users to access this Send.</value>
@@ -2030,19 +2030,19 @@ Scanning will happen automatically.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="OneDay" xml:space="preserve">
-    <value>১ দিন</value>
+    <value>1 day</value>
   </data>
   <data name="TwoDays" xml:space="preserve">
-    <value>২ দিন</value>
+    <value>2 days</value>
   </data>
   <data name="ThreeDays" xml:space="preserve">
     <value>3 days</value>
   </data>
   <data name="SevenDays" xml:space="preserve">
-    <value>৭ দিন</value>
+    <value>7 days</value>
   </data>
   <data name="ThirtyDays" xml:space="preserve">
-    <value>৩০ দিন</value>
+    <value>30 days</value>
   </data>
   <data name="Custom" xml:space="preserve">
     <value>Custom</value>
@@ -2141,18 +2141,12 @@ Scanning will happen automatically.</value>
     <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
   </data>
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
   </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>Your vault timeout exceeds the restrictions set by your organization.</value>
   </data>
-  <data name="DisablePersonalVaultExportPolicyInEffect" xml:space="preserve">
+  <data name="DisablePersonalVaultExportPolicyInEffect">
     <value>One or more organization policies prevents your from exporting your individual vault.</value>
   </data>
   <data name="AddAccount" xml:space="preserve">
@@ -2240,16 +2234,16 @@ Scanning will happen automatically.</value>
     <value>Options are collapsed, tap to expand.</value>
   </data>
   <data name="UppercaseAtoZ" xml:space="preserve">
-    <value>বড় হাতের অক্ষর (A-Z)</value>
+    <value>Uppercase (A to Z)</value>
   </data>
   <data name="LowercaseAtoZ" xml:space="preserve">
     <value>Lowercase (A to Z)</value>
   </data>
   <data name="NumbersZeroToNine" xml:space="preserve">
-    <value>সংখ্যা (0-9)</value>
+    <value>Numbers (0 to 9)</value>
   </data>
   <data name="SpecialCharacters" xml:space="preserve">
-    <value>বিশেষ অক্ষর (!@#$%^&amp;*)</value>
+    <value>Special characters (!@#$%^&amp;*)</value>
   </data>
   <data name="TapToGoBack" xml:space="preserve">
     <value>Tap to go back</value>
@@ -2352,10 +2346,10 @@ select Add TOTP to store the key safely</value>
     <value>Deny login</value>
   </data>
   <data name="JustNow" xml:space="preserve">
-    <value>এইমাত্র</value>
+    <value>Just now</value>
   </data>
   <data name="XMinutesAgo" xml:space="preserve">
-    <value>{0} মিনিট আগে</value>
+    <value>{0} minutes ago</value>
   </data>
   <data name="LogInAccepted" xml:space="preserve">
     <value>Login confirmed</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2506,7 +2500,7 @@ Do you want to switch to this account?</value>
     <value>Log in with master password</value>
   </data>
   <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log in with device</value>
+    <value>Log In with device</value>
   </data>
   <data name="LogInInitiated" xml:space="preserve">
     <value>Log in initiated</value>
@@ -2547,18 +2541,6 @@ Do you want to switch to this account?</value>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
     <value>Enable camera permission to use the scanner</value>
   </data>
-  <data name="Language" xml:space="preserve">
-    <value>ভাষা</value>
-  </data>
-  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>The language has been changed to {0}. Please restart the app to see the change</value>
-  </data>
-  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Language change requires app restart</value>
-  </data>
-  <data name="DefaultSystem" xml:space="preserve">
-    <value>Default (System)</value>
-  </data>
   <data name="Important" xml:space="preserve">
     <value>Important</value>
   </data>
@@ -2575,10 +2557,10 @@ Do you want to switch to this account?</value>
     <value>Weak</value>
   </data>
   <data name="Good" xml:space="preserve">
-    <value>ভালো</value>
+    <value>Good</value>
   </data>
   <data name="Strong" xml:space="preserve">
-    <value>শক্তিশালী</value>
+    <value>Strong</value>
   </data>
   <data name="CheckKnownDataBreachesForThisPassword" xml:space="preserve">
     <value>Check known data breaches for this password</value>
@@ -2595,46 +2577,4 @@ Do you want to switch to this account?</value>
   <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
     <value>Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?</value>
   </data>
-  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Organization SSO identifier required.</value>
-  </data>
-  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Add the key to an existing or new item</value>
-  </data>
-  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>There are no items in your vault that match "{0}"</value>
-  </data>
-  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Search for an item or add a new item</value>
-  </data>
-  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>There are no items that match the search</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.bs.resx

@@ -300,7 +300,7 @@
     <comment>The title for the vault page.</comment>
   </data>
   <data name="Authenticator" xml:space="preserve">
-    <value>Aplikacija za autentifikaciju</value>
+    <value>Authenticator</value>
     <comment>Authenticator TOTP feature</comment>
   </data>
   <data name="Name" xml:space="preserve">
@@ -583,8 +583,8 @@
   <data name="MasterPasswordHintDescription" xml:space="preserve">
     <value>Nagoveštaj glavne lozinke može Vam pomoći da zapamtite lozinku ako je zaboravite.</value>
   </data>
-  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Master password must be at least {0} characters long.</value>
+  <data name="MasterPasswordLengthValMessage" xml:space="preserve">
+    <value>Glavna lozinka mora imati najmanje 8 znakova.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>Minimalno brojeva</value>
@@ -775,10 +775,10 @@
     <value>Omogućeno</value>
   </data>
   <data name="Off" xml:space="preserve">
-    <value>Isključeno</value>
+    <value>Off</value>
   </data>
   <data name="On" xml:space="preserve">
-    <value>Uključeno</value>
+    <value>On</value>
   </data>
   <data name="Status" xml:space="preserve">
     <value>Status</value>
@@ -900,8 +900,8 @@
     <value>Ne može se pročitati ključ autentifikatora.</value>
   </data>
   <data name="PointYourCameraAtTheQRCode" xml:space="preserve">
-    <value>Usmjerite kameru prema QR kodu.
-Skeniranje će biti izvršeno automatski.</value>
+    <value>Point your camera at the QR Code.
+Scanning will happen automatically.</value>
   </data>
   <data name="ScanQrTitle" xml:space="preserve">
     <value>Skenirajte QR kod</value>
@@ -916,10 +916,10 @@ Skeniranje će biti izvršeno automatski.</value>
     <value>Iskopirajte TOTP</value>
   </data>
   <data name="CopyTotpAutomaticallyDescription" xml:space="preserve">
-    <value>Ako je za Vašu prijavu priložen autentifikacioni ključ, TOTP verifikacioni kod se automatski kopira u Vašu memoriju kad god automatski popunite prijavu.</value>
+    <value>If a login has an authenticator key, copy the TOTP verification code to your clip-board when you auto-fill the login.</value>
   </data>
   <data name="CopyTotpAutomatically" xml:space="preserve">
-    <value>Kopiraj TOTP (autentifikacijski kod) automatski</value>
+    <value>Copy TOTP automatically</value>
   </data>
   <data name="PremiumRequired" xml:space="preserve">
     <value>Za korišćenje ove funkcije potrebno je premium članstvo.</value>
@@ -1104,7 +1104,7 @@ Skeniranje će biti izvršeno automatski.</value>
     <value>Gđica</value>
   </data>
   <data name="Mx" xml:space="preserve">
-    <value>Rodno neutralan</value>
+    <value>Mx</value>
   </data>
   <data name="November" xml:space="preserve">
     <value>Novembar</value>
@@ -1140,10 +1140,10 @@ Skeniranje će biti izvršeno automatski.</value>
     <value>Rok upotrebe</value>
   </data>
   <data name="ShowWebsiteIcons" xml:space="preserve">
-    <value>Pokaži ikone web stranica</value>
+    <value>Show website icons</value>
   </data>
   <data name="ShowWebsiteIconsDescription" xml:space="preserve">
-    <value>Prikaži prepoznatljivu sliku pored svake prijave.</value>
+    <value>Show a recognizable image next to each login.</value>
   </data>
   <data name="IconsUrl" xml:space="preserve">
     <value>URL adresa servera ikona</value>
@@ -1415,7 +1415,7 @@ Skeniranje će biti izvršeno automatski.</value>
     <value>Nema kolekcija za prikazati.</value>
   </data>
   <data name="MovedItemToOrg" xml:space="preserve">
-    <value>{0} premješteno u {1}.</value>
+    <value>{0} moved to {1}.</value>
     <comment>ex: Item moved to Organization.</comment>
   </data>
   <data name="ItemShared" xml:space="preserve">
@@ -1556,7 +1556,7 @@ Skeniranje će biti izvršeno automatski.</value>
     <value>Zadana tamna tema</value>
   </data>
   <data name="DefaultDarkThemeDescription" xml:space="preserve">
-    <value>Odaberi korištenje tamne teme kada je uređaj već zadano koristi.</value>
+    <value>Choose the dark theme to use when using Default (System) theme while your device's dark mode is in use.</value>
   </data>
   <data name="CopyNotes" xml:space="preserve">
     <value>Kopiraj bilješke</value>
@@ -1583,16 +1583,16 @@ Skeniranje će biti izvršeno automatski.</value>
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
-    <value>Auto-popunjavanje blokiranih URI-ja</value>
+    <value>Auto-fill blocked URIs</value>
   </data>
   <data name="AutofillBlockedUrisDescription" xml:space="preserve">
-    <value>Auto-popunjavanje neće biti ponuđeno za blokirane URI-je. Odvoji višestruke URI-je zarezom. Npr. „https://twitter.com, androidapp://com.twitter.android”.</value>
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
   </data>
   <data name="AskToAddLogin" xml:space="preserve">
-    <value>Upitaj za dodavanje prijave</value>
+    <value>Ask to add login</value>
   </data>
   <data name="AskToAddLoginDescription" xml:space="preserve">
-    <value>Upitaj za dodavanje, ako se stavka već ne nalazi u trezoru.</value>
+    <value>Ask to add an item if one isn't found in your vault.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
     <value>Kod ponovnog pokretanja</value>
@@ -1752,11 +1752,11 @@ Skeniranje će biti izvršeno automatski.</value>
     <value>Želite li zaista poslati u smeće?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrijsko otključavanje onemogućeno do potvrde glavne lozinke.</value>
   </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometrijsko otključavanje za auto-ispunu onemogućeno do potvrde glavne lozinke.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Uključi sinkronizaciju pri osvježavanju</value>
@@ -1886,7 +1886,7 @@ Skeniranje će biti izvršeno automatski.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="Text" xml:space="preserve">
-    <value>Tekst</value>
+    <value>Text</value>
   </data>
   <data name="TypeText" xml:space="preserve">
     <value>Tekst</value>
@@ -1905,16 +1905,16 @@ Skeniranje će biti izvršeno automatski.</value>
     <value>Datoteka koju želiš poslati</value>
   </data>
   <data name="FileTypeIsSelected" xml:space="preserve">
-    <value>Odabrana je vrsta datoteke.</value>
+    <value>File type is selected.</value>
   </data>
   <data name="FileTypeIsNotSelected" xml:space="preserve">
-    <value>Vrsta datoteke nije odabrana, dodirnite za odabir.</value>
+    <value>File type is not selected, tap to select.</value>
   </data>
   <data name="TextTypeIsSelected" xml:space="preserve">
-    <value>Vrsta teksta je odabrana.</value>
+    <value>Text type is selected.</value>
   </data>
   <data name="TextTypeIsNotSelected" xml:space="preserve">
-    <value>Vrsta teksta nije odabrana, dodirnite za odabir.</value>
+    <value>Text type is not selected, tap to select.</value>
   </data>
   <data name="DeletionDate" xml:space="preserve">
     <value>Datum brisanja</value>
@@ -2142,16 +2142,10 @@ Skeniranje će biti izvršeno automatski.</value>
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
     <value>Pravilo tvoje organizacije utječe na vrijeme isteka trezora. Najveće dozvoljeno vrijeme isteka je {0} sata(i) i {1} minuta.</value>
   </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>Vrijeme isteka premašuje ograničenje koju je postavila tvoja organizacija.</value>
   </data>
-  <data name="DisablePersonalVaultExportPolicyInEffect" xml:space="preserve">
+  <data name="DisablePersonalVaultExportPolicyInEffect">
     <value>Jedno ili više pravila organizacija onemogućuje izvoz osobnog trezora. </value>
   </data>
   <data name="AddAccount" xml:space="preserve">
@@ -2227,88 +2221,89 @@ Skeniranje će biti izvršeno automatski.</value>
     <value>Unesi verifikacijski kod koji je poslan na tvoj E-Mail</value>
   </data>
   <data name="SubmitCrashLogs" xml:space="preserve">
-    <value>Pošaljite evidenciju o pogreškama u radu aplikacije</value>
+    <value>Submit crash logs</value>
   </data>
   <data name="SubmitCrashLogsDescription" xml:space="preserve">
-    <value>Pomozi Bitwardenu poboljšati stabilnost aplikacije šaljući evidenciju o pogreškama u radu aplikacije.</value>
+    <value>Help Bitwarden improve app stability by submitting crash reports.</value>
   </data>
   <data name="OptionsExpanded" xml:space="preserve">
-    <value>Opcije su proširene, dodirni za smanjivanje.</value>
+    <value>Options are expanded, tap to collapse.</value>
   </data>
   <data name="OptionsCollapsed" xml:space="preserve">
-    <value>Opcije su smanjene, dodirni za proširenje.</value>
+    <value>Options are collapsed, tap to expand.</value>
   </data>
   <data name="UppercaseAtoZ" xml:space="preserve">
-    <value>Velika slova (A-Z)</value>
+    <value>Uppercase (A to Z)</value>
   </data>
   <data name="LowercaseAtoZ" xml:space="preserve">
-    <value>Mala slova (a - z)</value>
+    <value>Lowercase (A to Z)</value>
   </data>
   <data name="NumbersZeroToNine" xml:space="preserve">
-    <value>Brojevi (0-9)</value>
+    <value>Numbers (0 to 9)</value>
   </data>
   <data name="SpecialCharacters" xml:space="preserve">
-    <value>Posebni znakovi (!@#$%^&amp;*)</value>
+    <value>Special characters (!@#$%^&amp;*)</value>
   </data>
   <data name="TapToGoBack" xml:space="preserve">
-    <value>Dodirnite za povratak</value>
+    <value>Tap to go back</value>
   </data>
   <data name="PasswordIsVisibleTapToHide" xml:space="preserve">
-    <value>Lozinka je vidljiva, dodirnite za skrivanje.</value>
+    <value>Password is visible, tap to hide.</value>
   </data>
   <data name="PasswordIsNotVisibleTapToShow" xml:space="preserve">
-    <value>Lozinka nije vidljiva, dodirnite za prikaz.</value>
+    <value>Password is not visible, tap to show.</value>
   </data>
   <data name="FilterByVault" xml:space="preserve">
-    <value>Filtrirajte stavke prema trezoru</value>
+    <value>Filter items by vault</value>
   </data>
   <data name="AllVaults" xml:space="preserve">
-    <value>Svi trezori</value>
+    <value>All vaults</value>
   </data>
   <data name="Vaults" xml:space="preserve">
-    <value>Trezori</value>
+    <value>Vaults</value>
   </data>
   <data name="VaultFilterDescription" xml:space="preserve">
-    <value>Trezor: {0}</value>
+    <value>Vault: {0}</value>
   </data>
   <data name="All" xml:space="preserve">
-    <value>Sve</value>
+    <value>All</value>
   </data>
   <data name="Totp" xml:space="preserve">
     <value>TOTP</value>
   </data>
   <data name="VerificationCodes" xml:space="preserve">
-    <value>Autentifikacijski kodovi</value>
+    <value>Verification codes</value>
   </data>
   <data name="PremiumSubscriptionRequired" xml:space="preserve">
-    <value>Potrebna Premium pretplata</value>
+    <value>Premium subscription required</value>
   </data>
   <data name="CannotAddAuthenticatorKey" xml:space="preserve">
-    <value>Nije moguće dodati autentifikacijski ključ? </value>
+    <value>Cannot add authenticator key? </value>
   </data>
   <data name="ScanQRCode" xml:space="preserve">
-    <value>Skenirajte QR kod</value>
+    <value>Scan QR Code</value>
   </data>
   <data name="CannotScanQRCode" xml:space="preserve">
-    <value>Nije moguće skenirati QR kod? </value>
+    <value>Cannot scan QR Code? </value>
   </data>
   <data name="AuthenticatorKeyScanner" xml:space="preserve">
-    <value>Autentifikacijski ključ</value>
+    <value>Authenticator key</value>
   </data>
   <data name="EnterKeyManually" xml:space="preserve">
-    <value>Ručno unesi ključ</value>
+    <value>Enter key manually</value>
   </data>
   <data name="AddTotp" xml:space="preserve">
-    <value>Dodaj TOTP</value>
+    <value>Add TOTP</value>
   </data>
   <data name="SetupTotp" xml:space="preserve">
-    <value>Podesi TOTP</value>
+    <value>Set up TOTP</value>
   </data>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
-    <value>Jednom kada je ključ uspješno unesen, odaberi „Dodaj TOTP” za sigurno spremanje ključa</value>
+    <value>Once the key is successfully entered,
+select Add TOTP to store the key safely</value>
   </data>
   <data name="NeverLockWarning" xml:space="preserve">
-    <value>Postavljanje zaključavanja na „Nikad” čini tvoj trezor dostupnim svima koji imaju pristupom tvom uređaju. Ako koristiš ovu mogućnost, pobrini se da je uređaj adekvatno zaštićen.</value>
+    <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
   <data name="EnvironmentPageUrlsError" xml:space="preserve">
     <value>One or more of the URLs entered are invalid. Please revise it and try to save again.</value>
@@ -2466,173 +2461,119 @@ Skeniranje će biti izvršeno automatski.</value>
     <value>Random</value>
   </data>
   <data name="ConnectToWatch" xml:space="preserve">
-    <value>Poveži se na Apple Watch</value>
+    <value>Connect to Watch</value>
   </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
-    <value>Odobrenje servisa pristupačnosti</value>
+    <value>Accessibility Service Disclosure</value>
   </data>
   <data name="AccessibilityDisclosureText" xml:space="preserve">
-    <value>Bitwarden koristi servis pristupačnosti za pretragu polja za prijavu u aplikacijama i na web stranicama, te potom određuje ID polja za unos korisničkog imena i lozinke kada su pronađeni odgovarajući podaci. Ne spremamo podatke koje servis daje, niti pokušavamo upravljati bilo kojim elementima na zaslonu osim tekstualnog unosa podataka.</value>
+    <value>Bitwarden uses the Accessibility Service to search for login fields in apps and websites, then establish the appropriate field IDs for entering a username &amp; password when a match for the app or site is found. We do not store any of the information presented to us by the service, nor do we make any attempt to control any on-screen elements beyond text entry of credentials.</value>
   </data>
   <data name="Accept" xml:space="preserve">
-    <value>Prihvati</value>
+    <value>Accept</value>
   </data>
   <data name="Decline" xml:space="preserve">
-    <value>Odbij</value>
+    <value>Decline</value>
   </data>
   <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
-    <value>Zahtjev za prijavu je već istekao.</value>
+    <value>Login request has already expired.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>Pokušaj prijave od:
+    <value>Login attempt from:
 {0}
-Želiš li se prebaciti na ovaj račun?</value>
+Do you want to switch to this account?</value>
   </data>
   <data name="NewAroundHere" xml:space="preserve">
-    <value>Novi ovdje?</value>
+    <value>New around here?</value>
   </data>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Dobijte podsjetnik glavne lozinke</value>
+    <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
-    <value>Nisi ti?</value>
+    <value>Not you?</value>
   </data>
   <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Prijava sa glavnom lozinkom</value>
+    <value>Log in with master password</value>
   </data>
   <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Prijava sa drugim uređajem</value>
+    <value>Log In with device</value>
   </data>
   <data name="LogInInitiated" xml:space="preserve">
-    <value>Prijava je pokrenuta</value>
+    <value>Log in initiated</value>
   </data>
   <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Obavijest je poslana na tvoj uređaj.</value>
+    <value>A notification has been sent to your device.</value>
   </data>
   <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Provjeri je li trezor otključan i slaže li se jedinstvena fraza s drugim uređajem.</value>
+    <value>Please make sure your vault is unlocked and the Fingerprint phrase matches on the other device.</value>
   </data>
   <data name="ResendNotification" xml:space="preserve">
-    <value>Ponovno pošalji obavijest</value>
+    <value>Resend notification</value>
   </data>
   <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Trebaš drugu opciju?</value>
+    <value>Need another option?</value>
   </data>
   <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Pogledaj sve mogućnosti prijave</value>
+    <value>View all log in options</value>
   </data>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
-    <value>Ovaj zahtjev više ne važi</value>
+    <value>This request is no longer valid</value>
   </data>
   <data name="PendingLogInRequests" xml:space="preserve">
-    <value>Zahtjevi za prijavu koji su na čekanju</value>
+    <value>Pending login requests</value>
   </data>
   <data name="DeclineAllRequests" xml:space="preserve">
-    <value>Odbij sve zahtjeve</value>
+    <value>Decline all requests</value>
   </data>
   <data name="AreYouSureYouWantToDeclineAllPendingLogInRequests" xml:space="preserve">
-    <value>Jeste li sigurni da želite odbiti sve zahtjeve koji su na čekanju?</value>
+    <value>Are you sure you want to decline all pending login requests?</value>
   </data>
   <data name="RequestsDeclined" xml:space="preserve">
-    <value>Zahtjevi odbijeni</value>
+    <value>Requests declined</value>
   </data>
   <data name="NoPendingRequests" xml:space="preserve">
-    <value>Nema zahtjeva na čekanju</value>  
+    <value>No pending requests</value>  
   </data>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Omogućite dozvolu za korištenje kamere da bi koristili skener</value>
-  </data>
-  <data name="Language" xml:space="preserve">
-    <value>Language</value>
-  </data>
-  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>The language has been changed to {0}. Please restart the app to see the change</value>
-  </data>
-  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Language change requires app restart</value>
-  </data>
-  <data name="DefaultSystem" xml:space="preserve">
-    <value>Default (System)</value>
+    <value>Enable camera permission to use the scanner</value>
   </data>
   <data name="Important" xml:space="preserve">
-    <value>Važno</value>
+    <value>Important</value>
   </data>
   <data name="YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum" xml:space="preserve">
-    <value>Tvoja glavna lozinka ne može biti oporavljena ukoliko je zaboraviš! {0} znakova najmanje.</value>
+    <value>Your master password cannot be recovered if you forget it! {0} characters minimum.</value>
   </data>
   <data name="WeakMasterPassword" xml:space="preserve">
-    <value>Slaba glavna lozinka</value>
+    <value>Weak Master Password</value>
   </data>
   <data name="WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount" xml:space="preserve">
-    <value>Slaba lozinka prepoznata. Koristite jaku lozinku za zaštitu Vašeg računa. Da li ste sigurni da želite koristiti slabu lozinku?</value>
+    <value>Weak password identified. Use a strong password to protect your account. Are you sure you want to use a weak password?</value>
   </data>
   <data name="Weak" xml:space="preserve">
-    <value>Slabo</value>
+    <value>Weak</value>
   </data>
   <data name="Good" xml:space="preserve">
-    <value>Dobro</value>
+    <value>Good</value>
   </data>
   <data name="Strong" xml:space="preserve">
-    <value>Jako</value>
+    <value>Strong</value>
   </data>
   <data name="CheckKnownDataBreachesForThisPassword" xml:space="preserve">
-    <value>Provjeri da li postoji kompromitovana baza podataka povezana sa ovom lozinkom</value>
+    <value>Check known data breaches for this password</value>
   </data>
   <data name="ExposedMasterPassword" xml:space="preserve">
-    <value>Glavna lozinka je kompromitovana</value>
+    <value>Exposed Master Password</value>
   </data>
   <data name="PasswordFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>Lozinka je pronađena u bazama podataka koje su provaljene. Koristite jedinstvenu lozinku da zaštitite vaš račun. Da li ste sigurni da želite koritstiti već kompromitovanu lozinku?</value>
+    <value>Password found in a data breach. Use a unique password to protect your account. Are you sure you want to use an exposed password?</value>
   </data>
   <data name="WeakAndExposedMasterPassword" xml:space="preserve">
-    <value>Slaba i kompromitovana glavna lozinka</value>
+    <value>Weak and Exposed Master Password</value>
   </data>
   <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>Slaba lozinka prepoznata i pronađena u kompromitovanim bazama podataka. Koristite jaku lozinku za zaštitu Vašeg računa. Da li ste sigurni da želite koristiti ovu lozinku?</value>
-  </data>
-  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Organization SSO identifier required.</value>
-  </data>
-  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Add the key to an existing or new item</value>
-  </data>
-  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>There are no items in your vault that match "{0}"</value>
-  </data>
-  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Search for an item or add a new item</value>
-  </data>
-  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>There are no items that match the search</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
+    <value>Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?</value>
   </data>
 </root>

src/App/Resources/AppResources.ca.resx

@@ -583,8 +583,8 @@
   <data name="MasterPasswordHintDescription" xml:space="preserve">
     <value>Una pista de contrasenya mestra pot ajudar-vos a recordar-la si la oblideu.</value>
   </data>
-  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>La contrasenya mestra ha de contenir almenys {0} caràcters.</value>
+  <data name="MasterPasswordLengthValMessage" xml:space="preserve">
+    <value>La contrasenya ha de contenir almenys 8 caràcters.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>Mínim de caràcters numèrics</value>
@@ -1752,11 +1752,11 @@ L'escaneig es farà automàticament.</value>
     <value>Esteu segur que voleu enviar-ho a la paperera?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>El desbloqueig biomètric d'aquest compte està deshabilitat mentre es verifica la contrasenya mestra.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>S'ha detectat un canvi biomètric. Inicieu la sessió mitjançant la contrasenya principal per tornar a activar-la.</value>
   </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>El desbloqueig biomètric d'emplenament automàtic d'aquest compte està deshabilitat mentre es verifica la contrasenya mestra.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Desbloqueig biomètric d'emplenament automàtic deshabilitat. Està pendent de verificació de la contrasenya mestra.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Activa la sincronització en actualitzar-se</value>
@@ -2140,18 +2140,12 @@ L'escaneig es farà automàticament.</value>
     <value>Aquesta organització té una política empresarial que us inscriurà automàticament al restabliment de la contrasenya. La inscripció permetrà als administradors de l’organització canviar la vostra contrasenya mestra.</value>
   </data>
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Les polítiques de l'organització afecten el temps d'espera de la caixa forta. El temps d'espera màxim permès de la caixa forta és de {0} hores i {1} minuts</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Les polítiques de l'organització afecten el temps d'espera de la vostra caixa forta. El temps d'espera màxim permès és de {0} hores i {1} minuts. L'acció de temps d'espera de la caixa forta està definida en {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Les polítiques de l'organització han establert l'acció de temps d'espera de la caixa forta a {0}.</value>
+    <value>Les polítiques de la vostra organització afecten el temps d'espera de la vostra caixa forta. El temps d'espera màxim permès de la caixa forta és de {0} hores i {1} minuts</value>
   </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>El temps d'espera de la caixa forta supera les restriccions establertes per la vostra organització.</value>
   </data>
-  <data name="DisablePersonalVaultExportPolicyInEffect" xml:space="preserve">
+  <data name="DisablePersonalVaultExportPolicyInEffect">
     <value>Una o més polítiques d'organització us impedeixen exportar la vostra caixa forta.</value>
   </data>
   <data name="AddAccount" xml:space="preserve">
@@ -2495,8 +2489,8 @@ Voleu canviar a aquest compte?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Obteniu la pista de la contrasenya mestra</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Inici de sessió com a {0} a {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Connectat com {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>No sou vosaltres?</value>
@@ -2505,7 +2499,7 @@ Voleu canviar a aquest compte?</value>
     <value>Inicia sessió amb la contrasenya mestra</value>
   </data>
   <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Inici de sessió amb un altre dispositiu</value>
+    <value>Inicia sessió amb un altre dispositiu</value>
   </data>
   <data name="LogInInitiated" xml:space="preserve">
     <value>S'ha iniciat la sessió</value>
@@ -2546,18 +2540,6 @@ Voleu canviar a aquest compte?</value>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
     <value>Habilita el permís de la càmera per utilitzar l'escàner</value>
   </data>
-  <data name="Language" xml:space="preserve">
-    <value>Idioma</value>
-  </data>
-  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>L'idioma s'ha canviat a {0}. Reinicieu l'aplicació per veure el canvi</value>
-  </data>
-  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>El canvi d'idioma requereix un reinici de l'aplicació</value>
-  </data>
-  <data name="DefaultSystem" xml:space="preserve">
-    <value>Per defecte (Sistema)</value>
-  </data>
   <data name="Important" xml:space="preserve">
     <value>Important</value>
   </data>
@@ -2594,46 +2576,4 @@ Voleu canviar a aquest compte?</value>
   <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
     <value>Contrasenya feble identificada i trobada en una filtració de dades. Utilitzeu una contrasenya única i segura per protegir el vostre compte. Esteu segur que voleu utilitzar aquesta contrasenya?</value>
   </data>
-  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>L’identificador SSO de l’organització és obligatori.</value>
-  </data>
-  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Afig la clau a un element existent o nou</value>
-  </data>
-  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>No hi ha cap element a la caixa forta que coincidisca amb "{0}"</value>
-  </data>
-  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Cerca un element o n'afig un nou</value>
-  </data>
-  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>No hi ha elements que coincidisquen amb la cerca</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>EUA</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>UE</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Autoallotjat</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Regió de dades</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Regió</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>La vostra contrasenya mestra no compleix una o més de les polítiques de l'organització. Per accedir a la caixa forta, heu d'actualitzar-la ara. Si continueu, es tancarà la sessió actual i us demanarà que torneu a iniciar-la. Les sessions en altres dispositius poden continuar romanent actives fins a una hora.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Contrasenya mestra actual</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Ajuda per tornar a demanar la contrasenya mestra</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>El desbloqueig pot fallar a causa de memòria insuficient. Disminueix la configuració de memòria KDF per resoldre-ho</value>
-  </data>
 </root>