Bumped version to 2023.1.0 (#2287)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
(cherry picked from commit f772ee7068)

.config/dotnet-tools.json

@@ -7,6 +7,12 @@
       "commands": [
         "dotnet-format"
       ]
+    },
+    "cake.tool": {
+      "version": "2.2.0",
+      "commands": [
+        "dotnet-cake"
+      ]
     }
   }
 }

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

@@ -14,6 +14,10 @@
         <string>Dist: Extension 2021</string>
         <key>com.8bit.bitwarden.share-extension</key>
         <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>
+        <string>Dist: Bitwarden Watch App Extension</string>
     </dict>
 </dict>
 </plist>

.github/workflows/build.yml

@@ -42,15 +42,15 @@ jobs:
         id: branch-check
         run: |
           if [[ $(git ls-remote --heads origin rc) ]]; then
-            echo "::set-output name=rc_branch_exists::1"
+            echo "rc_branch_exists=1" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=rc_branch_exists::0"
+            echo "rc_branch_exists=0" >> $GITHUB_OUTPUT
           fi
 
           if [[ $(git ls-remote --heads origin hotfix-rc) ]]; then
-            echo "::set-output name=hotfix_branch_exists::1"
+            echo "hotfix_branch_exists=1" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=hotfix_branch_exists::0"
+            echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT
           fi
         shell: bash
 
@@ -59,6 +59,10 @@ jobs:
     name: Android
     runs-on: windows-2022
     needs: setup
+    strategy:
+      fail-fast: false
+      matrix:
+        variant: ['prod', 'qa']
     steps:
       - name: Setup NuGet
         uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
@@ -67,7 +71,7 @@ jobs:
 
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
-
+          
       - name: Work Around for broken Windows 2022 Runner Image
         run: |
           Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
@@ -87,7 +91,6 @@ jobs:
               Write-Host "components were not installed"
               exit 1
           }
-
       - name: Print environment
         run: |
           nuget help | grep Version
@@ -98,7 +101,8 @@ jobs:
 
       - name: Checkout repo
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
-
+        with:
+          fetch-depth: 0
       - name: Decrypt secrets
         env:
           DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
@@ -109,12 +113,17 @@ jobs:
             --output ./src/Android/app_play-keystore.jks ./.github/secrets/app_play-keystore.jks.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output ./src/Android/app_upload-keystore.jks ./.github/secrets/app_upload-keystore.jks.gpg
-          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output ./src/Android/google-services.json ./.github/secrets/google-services.json.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output $HOME/secrets/play_creds.json ./.github/secrets/play_creds.json.gpg
         shell: bash
-
+      - name: Decrypt secrets - Google Services
+        if: ${{ matrix.variant == 'prod' }}
+        env:
+          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
+        run: |
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output ./src/Android/google-services.json ./.github/secrets/google-services.json.gpg
+        shell: bash
       - name: Increment version
         run: |
           BUILD_NUMBER=$((3000 + $GITHUB_RUN_NUMBER))
@@ -142,26 +151,35 @@ jobs:
         run: dotnet test test/Core.Test/Core.Test.csproj
 
       - name: Build Play Store publisher
+        if: ${{ matrix.variant == 'prod' }}
         run: dotnet build ./store/google/Publisher/Publisher.csproj -p:Configuration=Release
 
-      - name: Build for Play Store
+      - name: Setup Android build  (${{ matrix.variant }})
+        run: dotnet cake build.cake --target Android --variant ${{ matrix.variant }}
+
+      - name: Build Android
         run: |
           $configuration = "Release";
 
           Write-Output "########################################"
           Write-Output "##### Build $configuration Configuration"
           Write-Output "########################################"
-
           msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"
+
         shell: pwsh
 
-      - name: Sign for Play Store
+      - name: Sign Android Build
         env:
           PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }}
           UPLOAD_KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_PASSWORD }}
         run: |
           $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj");
-
+          $packageName = "com.x8bit.bitwarden";
+          
+          if ("${{ matrix.variant }}" -ne "prod") 
+          {
+            $packageName = "com.x8bit.bitwarden.${{ matrix.variant }}";
+          }
           Write-Output "########################################"
           Write-Output "##### Sign Google Play Bundle Release Configuration"
           Write-Output "########################################"
@@ -175,9 +193,8 @@ jobs:
           Write-Output "##### Copy Google Play Bundle to project root"
           Write-Output "########################################"
 
-          $signedAabPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/com.x8bit.bitwarden-Signed.aab");
-          $signedAabDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden.aab");
-
+          $signedAabPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/$($packageName)-Signed.aab");
+          $signedAabDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).aab");
           Copy-Item $signedAabPath $signedAabDestPath
 
           Write-Output "########################################"
@@ -193,33 +210,41 @@ jobs:
           Write-Output "##### Copy Release APK to project root"
           Write-Output "########################################"
 
-          $signedApkPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/com.x8bit.bitwarden-Signed.apk");
-          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden.apk");
+          $signedApkPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/$($packageName)-Signed.apk");
+          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).apk");
 
           Copy-Item $signedApkPath $signedApkDestPath
         shell: pwsh
-
-      - name: Upload Play Store .aab artifact
+      - name: Upload Prod .aab artifact
+        if: ${{ matrix.variant == 'prod' }}
         uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: com.x8bit.bitwarden.aab
           path: ./com.x8bit.bitwarden.aab
           if-no-files-found: error
 
-      - name: Upload Play Store .apk artifact
+      - name: Upload Prod .apk artifact
+        if: ${{ matrix.variant == 'prod' }}
         uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: com.x8bit.bitwarden.apk
           path: ./com.x8bit.bitwarden.apk
           if-no-files-found: error
 
+      - name: Upload Other .apk artifact
+        if: ${{ matrix.variant != 'prod' }}
+        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: Deploy to Play Store
-        if: |
-            (github.ref == 'refs/heads/master'
-              && needs.setup.outputs.rc_branch_exists == 0
-              && needs.setup.outputs.hotfix_branch_exists == 0)
-            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-            || github.ref == 'refs/heads/hotfix-rc'
+        if: ${{ matrix.variant == 'prod' && (( github.ref == 'refs/heads/master'
+          && needs.setup.outputs.rc_branch_exists == 0
+          && needs.setup.outputs.hotfix_branch_exists == 0)
+          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
+          || github.ref == 'refs/heads/hotfix-rc' ) }}
         run: |
           PUBLISHER_PATH="$GITHUB_WORKSPACE/store/google/Publisher/bin/Release/netcoreapp3.1/Publisher.dll"
           CREDS_PATH="$HOME/secrets/play_creds.json"
@@ -415,7 +440,7 @@ jobs:
 
   ios:
     name: Apple iOS
-    runs-on: macos-11
+    runs-on: macos-12
     needs: setup
     steps:
       - name: Setup NuGet
@@ -450,7 +475,7 @@ jobs:
           do
             VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
             echo "::add-mask::$VALUE"
-            echo "::set-output name=$i::$VALUE"
+            echo "$i=$VALUE" >> $GITHUB_OUTPUT
           done
 
       - name: Decrypt secrets
@@ -472,6 +497,14 @@ jobs:
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output $HOME/secrets/dist_share_extension.mobileprovision \
             ./.github/secrets/dist_share_extension.mobileprovision.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/dist_watch_app.mobileprovision \
+            ./.github/secrets/dist_watch_app.mobileprovision.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/dist_watch_app_extension.mobileprovision \
+            ./.github/secrets/dist_watch_app_extension.mobileprovision.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output ./src/watchOS/bitwarden/GoogleService-Info.plist ./.github/secrets/GoogleService-Info.plist.gpg
         shell: bash
 
       - name: Increment version
@@ -486,6 +519,9 @@ jobs:
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Extension/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Autofill/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.ShareExtension/Info.plist
+          cd src/watchOS/bitwarden
+          agvtool new-version -all  $BUILD_NUMBER
+          cd ../../..
         shell: bash
 
       - name: Update Entitlements
@@ -520,6 +556,8 @@ jobs:
           BITWARDEN_PROFILE_PATH=$HOME/secrets/dist_bitwarden.mobileprovision
           EXTENSION_PROFILE_PATH=$HOME/secrets/dist_extension.mobileprovision
           SHARE_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_share_extension.mobileprovision
+          WATCH_APP_PROFILE_PATH=$HOME/secrets/dist_watch_app.mobileprovision
+          WATCH_APP_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_watch_app_extension.mobileprovision
           PROFILES_DIR_PATH=$HOME/Library/MobileDevice/Provisioning\ Profiles
 
           mkdir -p "$PROFILES_DIR_PATH"
@@ -535,6 +573,25 @@ jobs:
 
           SHARE_EXTENSION_UUID=$(grep UUID -A1 -a $SHARE_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
           cp $SHARE_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$SHARE_EXTENSION_UUID.mobileprovision"
+
+          WATCH_APP_UUID=$(grep UUID -A1 -a $WATCH_APP_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
+          cp $WATCH_APP_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_UUID.mobileprovision"
+
+          WATCH_APP_EXTENSION_UUID=$(grep UUID -A1 -a $WATCH_APP_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
+          cp $WATCH_APP_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_EXTENSION_UUID.mobileprovision"
+        shell: bash
+
+      - name: Bulid WatchApp
+        run: |
+          echo "########################################"
+          echo "##### Build WatchApp with Release Configuration"
+          echo "########################################"
+          
+          xcodebuild archive -workspace ./src/watchOS/bitwarden/bitwarden.xcodeproj/project.xcworkspace -configuration Release -scheme bitwarden\ WatchKit\ App -archivePath ./src/watchOS/bitwarden
+
+          echo "########################################"
+          echo "##### Done"
+          echo "########################################"
         shell: bash
 
       - name: Restore packages
@@ -572,7 +629,12 @@ jobs:
           ARCHIVE_DSYMS_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive/dSYMs"
           EXPORT_PATH="./bitwarden-export"
 
-          cp -r $ARCHIVE_DSYMS_PATH $EXPORT_PATH
+          WATCH_ARCHIVE_DSYMS_PATH="./src/watchOS/bitwarden.xcarchive/dSYMs/"
+          WATCH_DSYMS_EXPORT_PATH="$EXPORT_PATH/Watch_dSYMs"
+
+          cp -r -v $ARCHIVE_DSYMS_PATH $EXPORT_PATH
+          mkdir $WATCH_DSYMS_EXPORT_PATH
+          cp -r -v $WATCH_ARCHIVE_DSYMS_PATH $WATCH_DSYMS_EXPORT_PATH
         shell: bash
 
       - name: Upload App Store .ipa & dSYMs artifacts
@@ -605,6 +667,22 @@ jobs:
         run: appcenter crashes upload-symbols -a bitwarden/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN
         shell: bash
 
+      - name: Upload Watch dSYMs to Firebase Crashlytics
+        if: |
+            (github.ref == 'refs/heads/master'
+              && needs.setup.outputs.rc_branch_exists == 0
+              && needs.setup.outputs.hotfix_branch_exists == 0)
+            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
+            || github.ref == 'refs/heads/hotfix-rc'
+        run: |
+
+          echo "########################################"
+          echo "##### Uploading Watch dSYMs to Firebase"
+          echo "########################################"
+
+          find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \;
+        shell: bash
+
       - name: Deploy to App Store
         if: |
             (github.ref == 'refs/heads/master'
@@ -651,7 +729,7 @@ jobs:
           do
             VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
             echo "::add-mask::$VALUE"
-            echo "::set-output name=$i::$VALUE"
+            echo "$i=$VALUE" >> $GITHUB_OUTPUT
           done
 
       - name: Upload Sources
@@ -719,7 +797,7 @@ jobs:
           do
             VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
             echo "::add-mask::$VALUE"
-            echo "::set-output name=$i::$VALUE"
+            echo "$i=$VALUE" >> $GITHUB_OUTPUT
           done
 
       - name: Notify Slack on failure

.github/workflows/release.yml

@@ -1,5 +1,6 @@
 ---
 name: Release
+run-name: Release ${{ inputs.release_type }}
 
 on:
   workflow_dispatch:
@@ -51,9 +52,10 @@ jobs:
         id: branch
         run: |
           BRANCH_NAME=$(basename ${{ github.ref }})
-          echo "::set-output name=branch-name::$BRANCH_NAME"
+          echo "branch-name=$BRANCH_NAME" >> $GITHUB_OUTPUT
 
       - name: Create GitHub deployment
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: chrnorm/deployment-action@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
         id: deployment
         with:
@@ -72,7 +74,7 @@ jobs:
           workflow_conclusion: success
           branch: ${{ steps.branch.outputs.branch-name }}
 
-      - name: Download all artifacts
+      - name: Dry Run - Download all artifacts
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
         uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
@@ -99,7 +101,7 @@ jobs:
           draft: true
 
       - name: Update deployment status to Success
-        if: ${{ success() }}
+        if: ${{ github.event.inputs.release_type != 'Dry Run' && success() }}
         uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
@@ -107,7 +109,7 @@ jobs:
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
 
       - name: Update deployment status to Failure
-        if: ${{ failure() }}
+        if: ${{ github.event.inputs.release_type != 'Dry Run' && failure() }}
         uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
@@ -133,7 +135,7 @@ jobs:
           branch: ${{ needs.release.outputs.branch-name }}
           name: com.x8bit.bitwarden-fdroid.apk
 
-      - name: Download F-Droid .apk artifact
+      - name: Dry Run - Download F-Droid .apk artifact
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
         uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:

.github/workflows/version-auto-bump.yml

@@ -29,7 +29,7 @@ jobs:
           NEW_PATCH=$((CURR_PATCH+1))
           NEW_VER=$CURR_MAJOR.$NEW_PATCH
           echo "New Version: $NEW_VER"
-          echo "::set-output name=new-version::$NEW_VER"
+          echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT
 
   trigger_version_bump:
     name: "Trigger version bump workflow"

.github/workflows/version-bump.yml

@@ -37,8 +37,7 @@ jobs:
           git_commit_gpgsign: true
 
       - name: Create Version Branch
-        run: |
-          git switch -c version_bump_${{ github.event.inputs.version_number }}
+        run: git switch -c version_bump_${{ github.event.inputs.version_number }}
 
       - name: Bump Version - Android XML
         uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
@@ -79,16 +78,15 @@ jobs:
         id: version-changed
         run: |
           if [ -n "$(git status --porcelain)" ]; then
-            echo "::set-output name=changes_to_commit::TRUE"
+            echo "changes_to_commit=TRUE" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=changes_to_commit::FALSE"
+            echo "changes_to_commit=FALSE" >> $GITHUB_OUTPUT
             echo "No changes to commit!";
           fi
 
       - name: Commit files
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
-        run: |
-          git commit -m "Bumped version to ${{ github.event.inputs.version_number }}" -a
+        run: git commit -m "Bumped version to ${{ github.event.inputs.version_number }}" -a
 
       - name: Push changes
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}

.gitignore

@@ -208,4 +208,130 @@ FakesAssemblies/
 # Other
 project.lock.json
 .DS_Store
-src/App/Css
+src/App/Css
+tools
+
+# Created by https://www.toptal.com/developers/gitignore/api/swift,objective-c
+# Edit at https://www.toptal.com/developers/gitignore?templates=swift,objective-c
+
+### Objective-C ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
+build/
+DerivedData/
+*.moved-aside
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+
+## Obj-C/Swift specific
+*.hmap
+
+## App packaging
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# Pods/
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build/
+
+# fastlane
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+
+# Code Injection
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
+### Objective-C Patch ###
+
+### Swift ###
+# Xcode
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+
+
+
+
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+# *.xcodeproj
+# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
+# hence it is not needed unless you have added a package configuration file to your project
+# .swiftpm
+
+.build/
+
+# CocoaPods
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# Pods/
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+
+# Accio dependency management
+Dependencies/
+.accio/
+
+# fastlane
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+
+# Code Injection
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+
+# End of https://www.toptal.com/developers/gitignore/api/swift,objective-c

README.md

@@ -12,7 +12,7 @@ The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin
 
 # Build/Run
 
-Please refer to the [Mobile section](https://contributing.bitwarden.com/mobile/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
+Please refer to the [Mobile section](https://contributing.bitwarden.com/getting-started/clients/mobile/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
 
 # We're Hiring!
 

build.cake

@@ -0,0 +1,346 @@
+#addin nuget:?package=Cake.FileHelpers&version=5.0.0
+#addin nuget:?package=Cake.AndroidAppManifest&version=1.1.2
+#addin nuget:?package=Cake.Plist&version=0.7.0
+#addin nuget:?package=Cake.Incubator&version=7.0.0
+#tool dotnet:?package=GitVersion.Tool&version=5.10.3
+using Path = System.IO.Path;
+
+var debugScript = Argument<bool>("debugScript", false);
+var target = Argument("target", "Default");
+var configuration = Argument("configuration", "Release");
+var variant = Argument("variant", "dev");
+
+abstract record VariantConfig(
+    string AppName, 
+    string AndroidPackageName,
+    string iOSBundleId,
+    string ApsEnvironment
+    );
+
+const string BASE_BUNDLE_ID_DROID = "com.x8bit.bitwarden";
+const string BASE_BUNDLE_ID_IOS = "com.8bit.bitwarden";
+
+record Dev(): VariantConfig("Bitwarden Dev", $"{BASE_BUNDLE_ID_DROID}.dev", $"{BASE_BUNDLE_ID_IOS}.dev", "development");
+record QA(): VariantConfig("Bitwarden QA", $"{BASE_BUNDLE_ID_DROID}.qa", $"{BASE_BUNDLE_ID_IOS}.qa", "development");
+record Beta(): VariantConfig("Bitwarden Beta", $"{BASE_BUNDLE_ID_DROID}.beta", $"{BASE_BUNDLE_ID_IOS}.beta", "production");
+record Prod(): VariantConfig("Bitwarden", $"{BASE_BUNDLE_ID_DROID}", $"{BASE_BUNDLE_ID_IOS}", "production");
+
+VariantConfig GetVariant() => variant.ToLower() switch{
+    "qa" => new QA(),
+    "beta" => new Beta(),
+    "prod" => new Prod(),
+    _ => new Dev()
+};
+
+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 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; 
+
+Task("GetGitInfo")
+    .Does(()=> {
+        _gitVersion = GitVersion(new GitVersionSettings());
+
+        if(debugScript)
+        {
+            Information($"GitVersion Dump:\n{_gitVersion.Dump()}");
+        }
+
+         Information("Git data Load successfully.");
+    });
+
+#region Android
+Task("UpdateAndroidAppIcon")
+    .Does(()=>{
+        //TODO we'll implement variant icons later
+        //manifest.ApplicationIcon = "@mipmap/ic_launcher";
+        Information($"Updated Androix App Icon with success");
+    });
+
+
+Task("UpdateAndroidManifest")
+    .IsDependentOn("GetGitInfo")
+    .Does(()=> 
+    {
+        var buildVariant = GetVariant();
+        var manifestPath = Path.Combine(_slnPath, "src", "Android", "Properties", "AndroidManifest.xml");
+
+        // Cake.AndroidAppManifest doesn't currently enable us to access nested items so, quick (not ideal) fix:
+        var manifestText = FileReadText(manifestPath);
+        manifestText = manifestText.Replace("com.x8bit.bitwarden.", buildVariant.AndroidPackageName + ".");
+        manifestText = manifestText.Replace("android:label=\"Bitwarden\"", $"android:label=\"{buildVariant.AppName}\"");
+        FileWriteText(manifestPath, manifestText);
+
+        var manifest = DeserializeAppManifest(manifestPath);
+
+        var prevVersionCode = manifest.VersionCode;
+        var prevVersionName = manifest.VersionName;
+        _androidPackageName = manifest.PackageName;
+
+        //manifest.VersionCode = CreateBuildNumber(prevVersionCode);
+        manifest.VersionName = GetVersionName(prevVersionName, buildVariant, _gitVersion);
+        manifest.PackageName = buildVariant.AndroidPackageName;
+        manifest.ApplicationLabel = buildVariant.AppName;
+
+        //Information($"AndroidManigest.xml VersionCode from {prevVersionCode} to {manifest.VersionCode}");
+        Information($"AndroidManigest.xml VersionName from {prevVersionName} to {manifest.VersionName}");
+        Information($"AndroidManigest.xml PackageName from {_androidPackageName} to {buildVariant.AndroidPackageName}");
+        Information($"AndroidManigest.xml ApplicationLabel to {buildVariant.AppName}");
+    
+        SerializeAppManifest(manifestPath, manifest);
+
+        Information("AndroidManifest updated with success!");
+    });
+
+void ReplaceInFile(string filePath, string oldtext, string newtext)
+{
+    var fileText = FileReadText(filePath);
+
+    if(string.IsNullOrEmpty(fileText) || !fileText.Contains(oldtext))
+    {
+        throw new Exception($"Couldn't find {filePath} or it didn't contain: {oldtext}");
+    }
+
+    fileText = fileText.Replace(oldtext, newtext);
+
+    FileWriteText(filePath, fileText);
+    Information($"{filePath} modified successfully.");		
+}
+
+Task("UpdateAndroidCodeFiles")
+    .IsDependentOn("UpdateAndroidManifest")
+    .Does(()=> {
+        var buildVariant = GetVariant();
+
+        //We're not using _androidPackageName here because the codefile is currently slightly different string than the one in AndroidManifest.xml
+        var keyName = "com.8bit.bitwarden";
+        var fixedPackageName = buildVariant.AndroidPackageName.Replace("x8bit", "8bit");
+        var filePath = Path.Combine(_slnPath, "src", "Android", "Services", "BiometricService.cs");
+        ReplaceInFile(filePath, keyName, fixedPackageName);
+
+        var packageFileList = new string[] {
+            Path.Combine(_slnPath, "src", "Android", "MainActivity.cs"),
+            Path.Combine(_slnPath, "src", "Android", "MainApplication.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Constants.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Accessibility", "AccessibilityService.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillHelpers.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillService.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Receivers", "ClearClipboardAlarmReceiver.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Receivers", "EventUploadReceiver.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Receivers", "PackageReplacedReceiver.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Receivers", "RestrictionsChangedReceiver.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Services", "DeviceActionService.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Services", "FileService.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Tiles", "AutofillTileService.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Tiles", "GeneratorTileService.cs"),
+            Path.Combine(_slnPath, "src", "Android", "Tiles", "MyVaultTileService.cs"),
+            Path.Combine(_slnPath, "src", "Android", "google-services.json"),
+            Path.Combine(_slnPath, "store", "google", "Publisher", "Program.cs"),
+        };
+
+        foreach(string path in packageFileList)
+        {
+            ReplaceInFile(path, "com.x8bit.bitwarden", buildVariant.AndroidPackageName);
+        }
+
+        var labelFileList = new string[] {
+            Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillService.cs"),
+        };
+
+        foreach(string path in labelFileList)
+        {
+            ReplaceInFile(path, "Bitwarden\"", $"{buildVariant.AppName}\"");
+        }
+    });
+#endregion Android
+
+#region iOS
+enum iOSProjectType
+{
+    Null,
+    MainApp,
+    Autofill,
+    Extension,
+    ShareExtension
+}
+
+string GetiOSBundleId(VariantConfig buildVariant, iOSProjectType projectType) => projectType switch
+{
+    iOSProjectType.Autofill => $"{buildVariant.iOSBundleId}.autofill",
+    iOSProjectType.Extension => $"{buildVariant.iOSBundleId}.find-login-action-extension",
+    iOSProjectType.ShareExtension => $"{buildVariant.iOSBundleId}.share-extension",
+    _ => buildVariant.iOSBundleId
+};
+
+string GetiOSBundleName(VariantConfig buildVariant, iOSProjectType projectType) => projectType switch
+{
+    iOSProjectType.Autofill => $"{buildVariant.AppName} Autofill",
+    iOSProjectType.Extension => $"{buildVariant.AppName} Extension",
+    iOSProjectType.ShareExtension => $"{buildVariant.AppName} Share Extension",
+    _ => buildVariant.AppName
+};
+
+private void UpdateiOSInfoPlist(string plistPath, VariantConfig buildVariant, GitVersion git, iOSProjectType projectType = iOSProjectType.MainApp)
+{
+    var plistFile = File(plistPath);
+    dynamic plist = DeserializePlist(plistFile);
+
+    var prevVersionName = plist["CFBundleShortVersionString"];
+    var prevVersionString = plist["CFBundleVersion"];
+    var prevVersion = int.Parse(plist["CFBundleVersion"]);
+    var prevBundleId = plist["CFBundleIdentifier"];
+    var prevBundleName = plist["CFBundleName"];
+    //var newVersion = CreateBuildNumber(prevVersion).ToString();
+    var newVersionName = GetVersionName(prevVersionName, buildVariant, git);
+    var newBundleId = GetiOSBundleId(buildVariant, projectType);
+    var newBundleName = GetiOSBundleName(buildVariant, projectType);
+
+    plist["CFBundleName"] = newBundleName;
+    plist["CFBundleDisplayName"] = newBundleName;
+    //plist["CFBundleVersion"] = newVersion;
+    plist["CFBundleShortVersionString"] = newVersionName;
+    plist["CFBundleIdentifier"] = newBundleId;
+
+    if(projectType == iOSProjectType.MainApp)
+    {
+        plist["CFBundleURLTypes"][0]["CFBundleURLName"] = $"{buildVariant.iOSBundleId}.url";
+    }
+
+    if(projectType == iOSProjectType.Extension)
+    {
+        var keyText = plist["NSExtension"]["NSExtensionAttributes"]["NSExtensionActivationRule"];
+        plist["NSExtension"]["NSExtensionAttributes"]["NSExtensionActivationRule"] = keyText.Replace("com.8bit.bitwarden", buildVariant.iOSBundleId);
+    }
+
+    SerializePlist(plistFile, plist);
+
+    Information($"Changed app name from {prevBundleName} to {newBundleName}");
+    //Information($"Changed Bundle Version from {prevVersion} to {newVersion}");
+    Information($"Changed Bundle Short Version name from {prevVersionName} to {newVersionName}");
+    Information($"Changed Bundle Identifier from {prevBundleId} to {newBundleId}");
+    Information($"{plistPath} updated with success!");
+}
+
+private void UpdateiOSEntitlementsPlist(string entitlementsPath, VariantConfig buildVariant)
+{
+    var EntitlementlistFile = File(entitlementsPath);
+    dynamic Entitlements = DeserializePlist(EntitlementlistFile);
+
+    Entitlements["aps-environment"] = buildVariant.ApsEnvironment;
+    Entitlements["keychain-access-groups"] = new List<string>() { "$(AppIdentifierPrefix)" + buildVariant.iOSBundleId };
+    Entitlements["com.apple.security.application-groups"] = new List<string>() { $"group.{buildVariant.iOSBundleId}" };;
+
+    Information($"Changed ApsEnvironment name to {buildVariant.ApsEnvironment}");
+    Information($"Changed keychain-access-groups bundleID to {buildVariant.iOSBundleId}");
+
+    SerializePlist(EntitlementlistFile, Entitlements);
+
+    Information($"{entitlementsPath} updated with success!");
+}
+
+Task("UpdateiOSIcon")
+    .Does(()=>{
+        //TODO we'll implement variant icons later
+        Information($"Updating IOS App Icon");
+    });
+
+Task("UpdateiOSPlist")
+    .IsDependentOn("GetGitInfo")
+    .Does(()=> {
+        var buildVariant = GetVariant();
+        var infoPath = Path.Combine(_slnPath, "src", "iOS", "Info.plist");
+        var entitlementsPath = Path.Combine(_slnPath, "src", "iOS", "Entitlements.plist");
+        UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.MainApp);
+        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
+    });
+
+Task("UpdateiOSAutofillPlist")
+    .IsDependentOn("GetGitInfo")
+    .IsDependentOn("UpdateiOSPlist")
+    .Does(()=> {
+        var buildVariant = GetVariant();
+        var infoPath = Path.Combine(_slnPath, "src", "iOS.Autofill", "Info.plist");
+        var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.Autofill", "Entitlements.plist");
+        UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.Autofill);
+        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
+    });
+
+Task("UpdateiOSExtensionPlist")
+    .IsDependentOn("GetGitInfo")
+    .IsDependentOn("UpdateiOSPlist")
+    .Does(()=> {
+        var buildVariant = GetVariant();
+        var infoPath = Path.Combine(_slnPath, "src", "iOS.Extension", "Info.plist");
+        var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.Extension", "Entitlements.plist");
+        UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.Extension);
+        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
+    });
+
+Task("UpdateiOSShareExtensionPlist")
+    .IsDependentOn("GetGitInfo")
+    .IsDependentOn("UpdateiOSPlist")
+    .Does(()=> {
+        var buildVariant = GetVariant();
+        var infoPath = Path.Combine(_slnPath, "src", "iOS.ShareExtension", "Info.plist");
+        var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.ShareExtension", "Entitlements.plist");
+        UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.ShareExtension);
+        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
+    });
+
+Task("UpdateiOSCodeFiles")
+    .IsDependentOn("UpdateiOSPlist")
+    .Does(()=> {
+        var buildVariant = GetVariant();
+        var fileList = new string[] {
+            Path.Combine(_slnPath, "src", "iOS.Core", "Utilities", "iOSCoreHelpers.cs"),
+            Path.Combine(_slnPath, "src", "iOS.Core", "Constants.cs"),
+            Path.Combine(".github", "resources", "export-options-ad-hoc.plist"),
+            Path.Combine(".github", "resources", "export-options-app-store.plist"),
+        };
+
+        foreach(string path in fileList)
+        {
+            ReplaceInFile(path, "com.8bit.bitwarden", buildVariant.iOSBundleId);
+        }
+    });
+#endregion iOS
+
+#region Main Tasks
+Task("Android")
+    //.IsDependentOn("UpdateAndroidAppIcon")
+    .IsDependentOn("UpdateAndroidManifest")
+    .IsDependentOn("UpdateAndroidCodeFiles")
+    .Does(()=>
+    {
+        Information("Android app updated");
+    });
+
+Task("iOS")
+    //.IsDependentOn("UpdateiOSIcon")
+    .IsDependentOn("UpdateiOSPlist")
+    .IsDependentOn("UpdateiOSAutofillPlist")
+    .IsDependentOn("UpdateiOSExtensionPlist")
+    .IsDependentOn("UpdateiOSShareExtensionPlist")
+    .IsDependentOn("UpdateiOSCodeFiles")
+    .Does(()=>
+    {
+        Information("iOS app updated");
+    });
+
+Task("Default")
+    .Does(() => {
+        var usage = @"Missing target.
+
+Usage:
+  dotnet cake build.cake --target (Android | iOS) --variant (dev | qa | beta | prod)
+
+Options:
+ --debugScript=<bool> Script debug mode.	
+";
+        Information(usage);
+    });
+#endregion Main Tasks
+
+RunTarget(target);

src/Android/Accessibility/AccessibilityHelpers.cs

@@ -33,6 +33,7 @@ namespace Bit.Droid.Accessibility
             //   - Resources/xml/autofillservice.xml
             new Browser("alook.browser", "search_fragment_input_view"),
             new Browser("alook.browser.google", "search_fragment_input_view"),
+            new Browser("app.vanadium.browser", "url_bar"),
             new Browser("com.amazon.cloud9", "url"),
             new Browser("com.android.browser", "url"),
             new Browser("com.android.chrome", "url_bar"),
@@ -66,6 +67,7 @@ namespace Bit.Droid.Accessibility
             new Browser("com.mmbox.xbrowser", "search_box"),
             new Browser("com.mycompany.app.soulbrowser", "edit_text"),
             new Browser("com.naver.whale", "url_bar"),
+            new Browser("com.neeva.app", "full_url_text_view"),
             new Browser("com.opera.browser", "url_field"),
             new Browser("com.opera.browser.beta", "url_field"),
             new Browser("com.opera.gx", "addressbarEdit"),
@@ -90,6 +92,7 @@ namespace Bit.Droid.Accessibility
             new Browser("io.github.forkmaintainers.iceraven", "mozac_browser_toolbar_url_view"),
             new Browser("mark.via", "am,an"),
             new Browser("mark.via.gp", "as"),
+            new Browser("net.dezor.browser", "url_bar"),
             new Browser("net.slions.fulguris.full.download", "search"),
             new Browser("net.slions.fulguris.full.download.debug", "search"),
             new Browser("net.slions.fulguris.full.playstore", "search"),
@@ -129,6 +132,7 @@ namespace Bit.Droid.Accessibility
             new Browser("com.htc.sense.browser", "title"),
             new Browser("com.jerky.browser2", "enterUrl"),
             new Browser("com.ksmobile.cb", "address_bar_edit_text"),
+            new Browser("com.lemurbrowser.exts","url_bar"),
             new Browser("com.linkbubble.playstore", "url_text"),
             new Browser("com.mx.browser", "address_editor_with_progress"),
             new Browser("com.mx.browser.tablet", "address_editor_with_progress"),

src/Android/Android.csproj

@@ -15,7 +15,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v12.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -77,12 +77,12 @@
     <PackageReference Include="Portable.BouncyCastle">
       <Version>1.9.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1" />
-    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.13" />
-    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.16" />
-    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.14" />
-    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.3.1" />
+    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1.1" />
+    <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.3</Version>
     </PackageReference>
@@ -103,8 +103,10 @@
     <Compile Include="Accessibility\Browser.cs" />
     <Compile Include="Accessibility\NodeList.cs" />
     <Compile Include="Accessibility\KnownUsernameField.cs" />
+    <Compile Include="Autofill\AutofillConstants.cs" />
     <Compile Include="Autofill\AutofillHelpers.cs" />
     <Compile Include="Autofill\AutofillService.cs" />
+    <Compile Include="Autofill\AutofillExternalSelectionActivity.cs" />
     <Compile Include="Autofill\Field.cs" />
     <Compile Include="Autofill\FieldCollection.cs" />
     <Compile Include="Autofill\FilledItem.cs" />
@@ -156,6 +158,8 @@
     <Compile Include="Services\FileService.cs" />
     <Compile Include="Services\AutofillHandler.cs" />
     <Compile Include="Constants.cs" />
+    <Compile Include="Effects\RemoveFontPaddingEffect.cs" />
+    <Compile Include="Services\WatchDeviceService.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\bwi-font.ttf" />

src/Android/Autofill/AutofillConstants.cs

@@ -0,0 +1,10 @@
+namespace Bit.Droid.Autofill
+{
+    public class AutofillConstants
+    {
+        public const string AutofillFramework = "autofillFramework";
+        public const string AutofillFrameworkFillType = "autofillFrameworkFillType";
+        public const string AutofillFrameworkUri = "autofillFrameworkUri";
+        public const string AutofillFrameworkCipherId = "autofillFrameworkCipherId";
+    }
+}

src/Android/Autofill/AutofillExternalSelectionActivity.cs

@@ -0,0 +1,42 @@
+using System.Threading.Tasks;
+using Android.App;
+using Android.Content.PM;
+using Android.OS;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using Bit.Droid.Utilities;
+
+namespace Bit.Droid.Autofill
+{
+    [Activity(
+        NoHistory = true,
+        LaunchMode = LaunchMode.SingleTop)]
+    public class AutofillExternalSelectionActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
+    {
+        protected override void OnCreate(Bundle bundle)
+        {
+            Intent?.Validate();
+            base.OnCreate(bundle);
+
+            var cipherId = Intent?.GetStringExtra(AutofillConstants.AutofillFrameworkCipherId);
+            if (string.IsNullOrEmpty(cipherId))
+            {
+                SetResult(Result.Canceled);
+                Finish();
+                return;
+            }
+
+            GetCipherAndPerformAutofillAsync(cipherId).FireAndForget();
+        }
+
+        private async Task GetCipherAndPerformAutofillAsync(string cipherId)
+        {
+            var cipherService = ServiceContainer.Resolve<ICipherService>();
+            var cipher = await cipherService.GetAsync(cipherId);
+            var decCipher = await cipher.DecryptAsync();
+
+            var autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
+            autofillHandler.Autofill(decCipher);
+        }
+    }
+}

src/Android/Autofill/AutofillHelpers.cs

@@ -54,6 +54,7 @@ namespace Bit.Droid.Autofill
         {
             "alook.browser",
             "alook.browser.google",
+            "app.vanadium.browser",
             "com.amazon.cloud9",
             "com.android.browser",
             "com.android.chrome",
@@ -78,6 +79,7 @@ namespace Bit.Droid.Autofill
             "com.jamal2367.styx",
             "com.kiwibrowser.browser",
             "com.kiwibrowser.browser.dev",
+            "com.lemurbrowser.exts",
             "com.microsoft.emmx",
             "com.microsoft.emmx.beta",
             "com.microsoft.emmx.canary",
@@ -86,6 +88,7 @@ namespace Bit.Droid.Autofill
             "com.mmbox.xbrowser",
             "com.mycompany.app.soulbrowser",
             "com.naver.whale",
+            "com.neeva.app",
             "com.opera.browser",
             "com.opera.browser.beta",
             "com.opera.gx",
@@ -109,6 +112,7 @@ namespace Bit.Droid.Autofill
             "io.github.forkmaintainers.iceraven",
             "mark.via",
             "mark.via.gp",
+            "net.dezor.browser",
             "net.slions.fulguris.full.download",
             "net.slions.fulguris.full.download.debug",            
             "net.slions.fulguris.full.playstore",
@@ -207,7 +211,7 @@ namespace Bit.Droid.Autofill
                         }
                     }
                     var dataset = BuildDataset(parser.ApplicationContext, parser.FieldCollection, items[i], 
-                        inlinePresentationSpec);
+                        true, inlinePresentationSpec);
                     if (dataset != null)
                     {
                         responseBuilder.AddDataset(dataset);
@@ -221,7 +225,7 @@ namespace Bit.Droid.Autofill
         }
 
         public static Dataset BuildDataset(Context context, FieldCollection fields, FilledItem filledItem,
-            InlinePresentationSpec inlinePresentationSpec = null)
+            bool includeAuthIntent, InlinePresentationSpec inlinePresentationSpec = null)
         {
             var overlayPresentation = BuildOverlayPresentation(
                 filledItem.Name,
@@ -242,6 +246,15 @@ namespace Bit.Droid.Autofill
             {
                 datasetBuilder.SetInlinePresentation(inlinePresentation);
             }
+            if (includeAuthIntent)
+            {
+                var intent = new Intent(context, typeof(AutofillExternalSelectionActivity));
+                intent.PutExtra(AutofillConstants.AutofillFramework, true);
+                intent.PutExtra(AutofillConstants.AutofillFrameworkCipherId, filledItem.Id);
+                var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent,
+                AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.CancelCurrent, true));
+                datasetBuilder.SetAuthentication(pendingIntent?.IntentSender);
+            }
             if (filledItem.ApplyToFields(fields, datasetBuilder))
             {
                 return datasetBuilder.Build();
@@ -253,25 +266,26 @@ namespace Bit.Droid.Autofill
             IList<InlinePresentationSpec> inlinePresentationSpecs = null)
         {
             var intent = new Intent(context, typeof(MainActivity));
-            intent.PutExtra("autofillFramework", true);
+            intent.PutExtra(AutofillConstants.AutofillFramework, true);
             if (fields.FillableForLogin)
             {
-                intent.PutExtra("autofillFrameworkFillType", (int)CipherType.Login);
+                intent.PutExtra(AutofillConstants.AutofillFrameworkFillType, (int)CipherType.Login);
             }
             else if (fields.FillableForCard)
             {
-                intent.PutExtra("autofillFrameworkFillType", (int)CipherType.Card);
+                intent.PutExtra(AutofillConstants.AutofillFrameworkFillType, (int)CipherType.Card);
             }
             else if (fields.FillableForIdentity)
             {
-                intent.PutExtra("autofillFrameworkFillType", (int)CipherType.Identity);
+                intent.PutExtra(AutofillConstants.AutofillFrameworkFillType, (int)CipherType.Identity);
             }
             else
             {
                 return null;
             }
-            intent.PutExtra("autofillFrameworkUri", uri);
-            var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent, AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.CancelCurrent, true));
+            intent.PutExtra(AutofillConstants.AutofillFrameworkUri, uri);
+            var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent,
+                AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.CancelCurrent, true));
 
             var overlayPresentation = BuildOverlayPresentation(
                 AppResources.AutofillWithBitwarden,

src/Android/Autofill/FilledItem.cs

@@ -23,6 +23,7 @@ namespace Bit.Droid.Autofill
 
         public FilledItem(CipherView cipher)
         {
+            Id = cipher.Id;
             Name = cipher.Name;
             Type = cipher.Type;
             Subtitle = cipher.SubTitle;
@@ -55,6 +56,7 @@ namespace Bit.Droid.Autofill
             }
         }
 
+        public string Id { get; set; }
         public string Name { get; set; }
         public string Subtitle { get; set; } = string.Empty;
         public int Icon { get; set; } = Resource.Drawable.login;

src/Android/Effects/RemoveFontPaddingEffect.cs

@@ -0,0 +1,23 @@
+using Android.Widget;
+using Bit.Droid.Effects;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportEffect(typeof(RemoveFontPaddingEffect), nameof(RemoveFontPaddingEffect))]
+namespace Bit.Droid.Effects
+{
+    public class RemoveFontPaddingEffect : PlatformEffect
+    {
+        protected override void OnAttached()
+        {
+            if (Control is TextView textView)
+            {
+                textView.SetIncludeFontPadding(false);
+            }
+        }
+
+        protected override void OnDetached()
+        {
+        }
+    }
+}

src/Android/MainActivity.cs

@@ -18,6 +18,7 @@ using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
+using Bit.Droid.Autofill;
 using Bit.Droid.Receivers;
 using Bit.Droid.Utilities;
 using Newtonsoft.Json;
@@ -322,13 +323,13 @@ namespace Bit.Droid
         {
             var options = new AppOptions
             {
-                Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra("autofillFrameworkUri"),
+                Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra(AutofillConstants.AutofillFrameworkUri),
                 MyVaultTile = Intent.GetBooleanExtra("myVaultTile", false),
                 GeneratorTile = Intent.GetBooleanExtra("generatorTile", false),
-                FromAutofillFramework = Intent.GetBooleanExtra("autofillFramework", false),
+                FromAutofillFramework = Intent.GetBooleanExtra(AutofillConstants.AutofillFramework, false),
                 CreateSend = GetCreateSendRequest(Intent)
             };
-            var fillType = Intent.GetIntExtra("autofillFrameworkFillType", 0);
+            var fillType = Intent.GetIntExtra(AutofillConstants.AutofillFrameworkFillType, 0);
             if (fillType > 0)
             {
                 options.FillType = (CipherType)fillType;

src/Android/MainApplication.cs

@@ -45,9 +45,16 @@ namespace Bit.Droid
             if (ServiceContainer.RegisteredServices.Count == 0)
             {
                 RegisterLocalServices();
+
                 var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
                 ServiceContainer.Init(deviceActionService.DeviceUserAgent, Core.Constants.ClearCiphersCacheKey,
                     Core.Constants.AndroidAllClearCipherCacheKeys);
+
+                ServiceContainer.Register<IWatchDeviceService>(new WatchDeviceService(ServiceContainer.Resolve<ICipherService>(),
+                    ServiceContainer.Resolve<IEnvironmentService>(),
+                    ServiceContainer.Resolve<IStateService>(),
+                    ServiceContainer.Resolve<IVaultTimeoutService>()));
+
                 InitializeAppSetup();
 
                 // TODO: Update when https://github.com/bitwarden/mobile/pull/1662 gets merged
@@ -73,8 +80,9 @@ namespace Bit.Droid
                     ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
                     ServiceContainer.Resolve<IAuthService>("authService"),
                     ServiceContainer.Resolve<ILogger>("logger"),
-                    ServiceContainer.Resolve<IMessagingService>("messagingService"));
-                    ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
+                    ServiceContainer.Resolve<IMessagingService>("messagingService"),
+                    ServiceContainer.Resolve<IWatchDeviceService>());
+                ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
             }
 #if !FDROID
             if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
@@ -141,9 +149,10 @@ namespace Bit.Droid
             var clipboardService = new ClipboardService(stateService);
             var deviceActionService = new DeviceActionService(stateService, messagingService);
             var fileService = new FileService(stateService, broadcasterService);
-            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService, new LazyResolve<IEventService>());
             var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, clipboardService,
                 messagingService, broadcasterService);
+            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService,
+                platformUtilsService, new LazyResolve<IEventService>());
             var biometricService = new BiometricService();
             var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
             var cryptoService = new CryptoService(stateService, cryptoFunctionService);

src/Android/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?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="2022.10.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="32" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.1.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" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -40,10 +40,16 @@
 			</intent-filter>
 		</activity>
 	</application>
-	<!-- Package visibility (for Android 11+) -->
+	<!-- Support for Xamarin.Essentials.Browser.OpenAsync  (for Android > 11) -->
+	<!-- Related docs: https://learn.microsoft.com/en-us/xamarin/essentials/open-browser?tabs=android -->
 	<queries>
 		<intent>
-			<action android:name="*" />
+			<action android:name="android.intent.action.VIEW" />
+			<data android:scheme="http"/>
+		</intent>
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<data android:scheme="https"/>
 		</intent>
 	</queries>
 </manifest>

src/Android/Receivers/ClearClipboardAlarmReceiver.cs

@@ -1,4 +1,5 @@
 using Android.Content;
+using Android.OS;
 
 namespace Bit.Droid.Receivers
 {
@@ -8,7 +9,17 @@ namespace Bit.Droid.Receivers
         public override void OnReceive(Context context, Intent intent)
         {
             var clipboardManager = context.GetSystemService(Context.ClipboardService) as ClipboardManager;
-            clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", " ");
+            if (clipboardManager == null)
+            {
+                return;
+            }
+            // ClearPrimaryClip is supported down to API 28 with mixed results, so we're requiring 33+ instead
+            if ((int)Build.VERSION.SdkInt < 33)
+            {
+                clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", " ");
+                return;
+            }
+            clipboardManager.ClearPrimaryClip();
         }
     }
 }

src/Android/Renderers/CustomSwitchRenderer.cs

@@ -44,6 +44,7 @@ namespace Bit.Droid.Renderers
             }
             if (Control != null)
             {
+                Control.SetHintTextColor(ThemeHelpers.MutedColor);
                 var t = ResourcesCompat.GetDrawable(Resources, Resource.Drawable.switch_thumb, null);
                 if (t is GradientDrawable thumb)
                 {

src/Android/Resources/xml/autofillservice.xml

@@ -17,6 +17,9 @@
   <compatibility-package
     android:name="alook.browser.google"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="app.vanadium.browser"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.amazon.cloud9"
     android:maxLongVersionCode="10000000000"/>
@@ -89,6 +92,9 @@
   <compatibility-package
     android:name="com.kiwibrowser.browser.dev"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.lemurbrowser.exts"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.microsoft.emmx"
     android:maxLongVersionCode="10000000000"/>
@@ -113,6 +119,9 @@
   <compatibility-package
     android:name="com.naver.whale"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.neeva.app"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.opera.browser"
     android:maxLongVersionCode="10000000000"/>
@@ -182,6 +191,9 @@
   <compatibility-package
     android:name="mark.via.gp"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="net.dezor.browser"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="net.slions.fulguris.full.download"
     android:maxLongVersionCode="10000000000"/>

src/Android/Services/AutofillHandler.cs

@@ -6,6 +6,7 @@ using Android.Content;
 using Android.OS;
 using Android.Provider;
 using Android.Views.Autofill;
+using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.View;
@@ -20,16 +21,19 @@ namespace Bit.Droid.Services
         private readonly IStateService _stateService;
         private readonly IMessagingService _messagingService;
         private readonly IClipboardService _clipboardService;
+        private readonly IPlatformUtilsService _platformUtilsService;
         private readonly LazyResolve<IEventService> _eventService;
 
         public AutofillHandler(IStateService stateService,
             IMessagingService messagingService,
             IClipboardService clipboardService,
+            IPlatformUtilsService platformUtilsService,
             LazyResolve<IEventService> eventService)
         {
             _stateService = stateService;
             _messagingService = messagingService;
             _clipboardService = clipboardService;
+            _platformUtilsService = platformUtilsService;
             _eventService = eventService;
         }
 
@@ -73,12 +77,12 @@ namespace Bit.Droid.Services
 
         public void Autofill(CipherView cipher)
         {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+            var activity = CrossCurrentActivity.Current.Activity as Xamarin.Forms.Platform.Android.FormsAppCompatActivity;
             if (activity == null)
             {
                 return;
             }
-            if (activity.Intent?.GetBooleanExtra("autofillFramework", false) ?? false)
+            if (activity.Intent?.GetBooleanExtra(AutofillConstants.AutofillFramework, false) ?? false)
             {
                 if (cipher == null)
                 {
@@ -103,7 +107,7 @@ namespace Bit.Droid.Services
                     return;
                 }
                 var task = CopyTotpAsync(cipher);
-                var dataset = AutofillHelpers.BuildDataset(activity, parser.FieldCollection, new FilledItem(cipher));
+                var dataset = AutofillHelpers.BuildDataset(activity, parser.FieldCollection, new FilledItem(cipher), false);
                 var replyIntent = new Intent();
                 replyIntent.PutExtra(AutofillManager.ExtraAuthenticationResult, dataset);
                 activity.SetResult(Result.Ok, replyIntent);
@@ -202,6 +206,7 @@ namespace Bit.Droid.Services
                     if (totp != null)
                     {
                         await _clipboardService.CopyTextAsync(totp);
+                        _platformUtilsService.ShowToastForCopiedValue(AppResources.VerificationCodeTotp);
                     }
                 }
             }

src/Android/Services/ClipboardService.cs

@@ -6,7 +6,6 @@ using Android.OS;
 using Bit.Core.Abstractions;
 using Bit.Droid.Receivers;
 using Bit.Droid.Utilities;
-using Plugin.CurrentActivity;
 using Xamarin.Essentials;
 
 namespace Bit.Droid.Services
@@ -21,9 +20,9 @@ namespace Bit.Droid.Services
             _stateService = stateService;
 
             _clearClipboardPendingIntent = new Lazy<PendingIntent>(() =>
-                PendingIntent.GetBroadcast(CrossCurrentActivity.Current.Activity,
+                PendingIntent.GetBroadcast(Application.Context,
                                            0,
-                                           new Intent(CrossCurrentActivity.Current.Activity, typeof(ClearClipboardAlarmReceiver)),
+                                           new Intent(Application.Context, typeof(ClearClipboardAlarmReceiver)),
                                            AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, false)));
         }
 
@@ -45,7 +44,7 @@ namespace Bit.Droid.Services
             }
             catch (Java.Lang.SecurityException ex) when (ex.Message.Contains("does not belong to"))
             {
-                // #1962 Just ignore, the content is copied either way but there is some app interfiering in the process
+                // #1962 Just ignore, the content is copied either way but there is some app interfering in the process
                 // that the OS catches and just throws this exception.
             }
         }
@@ -58,9 +57,7 @@ namespace Bit.Droid.Services
 
         private void CopyToClipboard(string text, bool isSensitive = true)
         {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            var clipboardManager = activity.GetSystemService(
-                Context.ClipboardService) as Android.Content.ClipboardManager;
+            var clipboardManager = Application.Context.GetSystemService(Context.ClipboardService) as ClipboardManager;
             var clipData = ClipData.NewPlainText("bitwarden", text);
             if (isSensitive)
             {
@@ -87,7 +84,7 @@ namespace Bit.Droid.Services
                 return;
             }
             var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + clearMs;
-            var alarmManager = CrossCurrentActivity.Current.Activity.GetSystemService(Context.AlarmService) as AlarmManager;
+            var alarmManager = Application.Context.GetSystemService(Context.AlarmService) as AlarmManager;
             alarmManager.Set(AlarmType.Rtc, triggerMs, _clearClipboardPendingIntent.Value);
         }
     }

src/Android/Services/DeviceActionService.cs

@@ -18,6 +18,7 @@ using Bit.Core.Enums;
 using Bit.Core.Utilities;
 using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
+using static Bit.App.Pages.SettingsPageViewModel;
 
 namespace Bit.Droid.Services
 {
@@ -69,14 +70,17 @@ namespace Bit.Droid.Services
 
         public bool LaunchApp(string appName)
         {
+            if ((int)Build.VERSION.SdkInt < 33)
+            {
+                // API 33 required to avoid using wildcard app visibility or dangerous permissions
+                // https://developer.android.com/reference/android/content/pm/PackageManager#getLaunchIntentSenderForPackage(java.lang.String)
+                return false;
+            }
             var activity = CrossCurrentActivity.Current.Activity;
             appName = appName.Replace("androidapp://", string.Empty);
-            var launchIntent = activity.PackageManager.GetLaunchIntentForPackage(appName);
-            if (launchIntent != null)
-            {
-                activity.StartActivity(launchIntent);
-            }
-            return launchIntent != null;
+            var launchIntentSender = activity?.PackageManager?.GetLaunchIntentSenderForPackage(appName);
+            launchIntentSender?.SendIntent(activity, Result.Ok, null, null, null);
+            return launchIntentSender != null;
         }
 
         public async Task ShowLoadingAsync(string text)
@@ -520,5 +524,11 @@ namespace Bit.Droid.Services
             intent.SetData(uri);
             Application.Context.StartActivity(intent);
         }
+
+        public void CloseExtensionPopUp()
+        {
+            // only used by iOS
+            throw new NotImplementedException();
+        }
     }
 }

src/Android/Services/LocalizeService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using Bit.App.Abstractions;
 using Bit.App.Models;
@@ -25,13 +26,13 @@ namespace Bit.Droid.Services
                 try
                 {
                     var fallback = ToDotnetFallbackLanguage(new PlatformCulture(netLanguage));
-                    Console.WriteLine(netLanguage + " failed, trying " + fallback + " (" + e1.Message + ")");
+                    Debug.WriteLine(netLanguage + " failed, trying " + fallback + " (" + e1.Message + ")");
                     ci = new CultureInfo(fallback);
                 }
                 catch (CultureNotFoundException e2)
                 {
                     // iOS language not valid .NET culture, falling back to English
-                    Console.WriteLine(netLanguage + " couldn't be set, using 'en' (" + e2.Message + ")");
+                    Debug.WriteLine(netLanguage + " couldn't be set, using 'en' (" + e2.Message + ")");
                     ci = new CultureInfo("en");
                 }
             }
@@ -40,7 +41,7 @@ namespace Bit.Droid.Services
 
         private string AndroidToDotnetLanguage(string androidLanguage)
         {
-            Console.WriteLine("Android Language:" + androidLanguage);
+            Debug.WriteLine("Android Language:" + androidLanguage);
             var netLanguage = androidLanguage;
             if (androidLanguage.StartsWith("zh"))
             {
@@ -79,13 +80,13 @@ namespace Bit.Droid.Services
                         // ONLY use cultures that have been tested and known to work
                 }
             }
-            Console.WriteLine(".NET Language/Locale:" + netLanguage);
+            Debug.WriteLine(".NET Language/Locale:" + netLanguage);
             return netLanguage;
         }
 
         private string ToDotnetFallbackLanguage(PlatformCulture platCulture)
         {
-            Console.WriteLine(".NET Fallback Language:" + platCulture.LanguageCode);
+            Debug.WriteLine(".NET Fallback Language:" + platCulture.LanguageCode);
             var netLanguage = platCulture.LanguageCode; // use the first part of the identifier (two chars, usually);
             switch (platCulture.LanguageCode)
             {
@@ -95,7 +96,7 @@ namespace Bit.Droid.Services
                     // add more application-specific cases here (if required)
                     // ONLY use cultures that have been tested and known to work
             }
-            Console.WriteLine(".NET Fallback Language/Locale:" + netLanguage + " (application-specific)");
+            Debug.WriteLine(".NET Fallback Language/Locale:" + netLanguage + " (application-specific)");
             return netLanguage;
         }
 

src/Android/Services/WatchDeviceService.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Threading.Tasks;
+using Bit.App.Services;
+using Bit.Core.Abstractions;
+using Bit.Core.Models;
+
+namespace Bit.Droid.Services
+{
+    public class WatchDeviceService : BaseWatchDeviceService
+    {
+        public WatchDeviceService(ICipherService cipherService,
+            IEnvironmentService environmentService,
+            IStateService stateService,
+            IVaultTimeoutService vaultTimeoutService)
+            : base(cipherService, environmentService, stateService, vaultTimeoutService)
+        {
+        }
+
+        protected override bool IsSupported => false;
+
+        public override bool IsConnected => false;
+
+        protected override bool CanSendData => false;
+
+        protected override Task SendDataToWatchAsync(WatchDTO watchDto) => throw new NotImplementedException();
+
+        protected override void ConnectToWatch() => throw new NotImplementedException();
+    }
+}

src/Android/Utilities/ThemeHelpers.cs

@@ -62,7 +62,7 @@ namespace Bit.Droid.Utilities
                 theme = ThemeManager.Dark;
             }
 
-            if (theme == ThemeManager.Dark || theme == ThemeManager.Black || theme == ThemeManager.Nord)
+            if (theme == ThemeManager.Dark || theme == ThemeManager.Black || theme == ThemeManager.Nord || theme == ThemeManager.SolarizedDark)
             {
                 LightTheme = false;
             }

src/App/Abstractions/IAccountsManager.cs

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

src/App/Abstractions/IDeviceActionService.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Bit.Core.Enums;
+using Bit.Core.Models;
 
 namespace Bit.App.Abstractions
 {
@@ -37,5 +38,6 @@ namespace Bit.App.Abstractions
         Task OnAccountSwitchCompleteAsync();
         Task SetScreenCaptureAllowedAsync();
         void OpenAppSettings();
+        void CloseExtensionPopUp();
     }
 }

src/App/App.csproj

@@ -125,6 +125,9 @@
     <Compile Update="Pages\Accounts\LoginPasswordlessPage.xaml.cs">
       <DependentUpon>LoginPasswordlessPage.xaml</DependentUpon>
     </Compile>
+    <Compile Update="Pages\Accounts\LoginPasswordlessRequestPage.xaml.cs">
+      <DependentUpon>LoginPasswordlessRequestPage.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -139,6 +142,7 @@
     <Folder Include="Controls\AccountSwitchingOverlay\" />
     <Folder Include="Utilities\AccountManagement\" />
     <Folder Include="Controls\DateTime\" />
+    <Folder Include="Controls\IconLabelButton\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -430,5 +434,6 @@
     <None Remove="Controls\AccountSwitchingOverlay\" />
     <None Remove="Utilities\AccountManagement\" />
     <None Remove="Controls\DateTime\" />
+    <None Remove="Controls\IconLabelButton\" />
   </ItemGroup>
 </Project>

src/App/App.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Models;
@@ -33,8 +34,9 @@ namespace Bit.App
         private readonly IAccountsManager _accountsManager;
         private readonly IPushNotificationService _pushNotificationService;
         private static bool _isResumed;
-        // this variable is static because the app is launching new activities on notification click, creating new instances of App. 
+        // these variables are static because the app is launching new activities on notification click, creating new instances of App. 
         private static bool _pendingCheckPasswordlessLoginRequests;
+        private static object _processingLoginRequestLock = new object();
 
         public App(AppOptions appOptions)
         {
@@ -143,9 +145,15 @@ namespace Bit.App
                                 new NavigationPage(new RemoveMasterPasswordPage()));
                         });
                     }
-                    else if (message.Command == "passwordlessLoginRequest" || message.Command == "unlocked" || message.Command == AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED)
+                    else if (message.Command == Constants.PasswordlessLoginRequestKey
+                        || message.Command == "unlocked"
+                        || message.Command == AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED)
                     {
-                        CheckPasswordlessLoginRequestsAsync().FireAndForget();
+                        lock (_processingLoginRequestLock)
+                        {
+                            // lock doesn't allow for async execution
+                            CheckPasswordlessLoginRequestsAsync().Wait();
+                        }
                     }
                 }
                 catch (Exception ex)
@@ -162,7 +170,6 @@ namespace Bit.App
                 _pendingCheckPasswordlessLoginRequests = true;
                 return;
             }
-
             _pendingCheckPasswordlessLoginRequests = false;
             if (await _vaultTimeoutService.IsLockedAsync())
             {
@@ -182,6 +189,11 @@ namespace Bit.App
 
             // Delay to wait for the vault page to appear
             await Task.Delay(2000);
+            // if there is a request modal opened ignore all incoming requests
+            if (App.Current.MainPage.Navigation.ModalStack.Any(p => p is NavigationPage navPage && navPage.CurrentPage is LoginPasswordlessPage))
+            {
+                return;
+            }
             var loginRequestData = await _authService.GetPasswordlessLoginRequestByIdAsync(notification.Id);
             var page = new LoginPasswordlessPage(new LoginPasswordlessDetails()
             {
@@ -192,11 +204,11 @@ namespace Bit.App
                 FingerprintPhrase = loginRequestData.RequestFingerprint,
                 RequestDate = loginRequestData.CreationDate,
                 DeviceType = loginRequestData.RequestDeviceType,
-                Origin = loginRequestData.Origin,
+                Origin = loginRequestData.Origin
             });
             await _stateService.SetPasswordlessLoginNotificationAsync(null);
             _pushNotificationService.DismissLocalNotification(Constants.PasswordlessNotificationId);
-            if (loginRequestData.CreationDate.ToUniversalTime().AddMinutes(Constants.PasswordlessNotificationTimeoutInMinutes) > DateTime.UtcNow)
+            if (!loginRequestData.IsExpired)
             {
                 await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.Navigation.PushModalAsync(new NavigationPage(page)));
             }
@@ -211,13 +223,20 @@ namespace Bit.App
             }
 
             var notificationUserEmail = await _stateService.GetEmailAsync(notification.UserId);
-            await Device.InvokeOnMainThreadAsync(async () =>
+            Device.BeginInvokeOnMainThread(async () =>
             {
-                var result = await _deviceActionService.DisplayAlertAsync(AppResources.LogInRequested, string.Format(AppResources.LoginAttemptFromXDoYouWantToSwitchToThisAccount, notificationUserEmail), AppResources.Cancel, AppResources.Ok);
-                if (result == AppResources.Ok)
+                try
                 {
-                    await _stateService.SetActiveUserAsync(notification.UserId);
-                    _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
+                    var result = await _deviceActionService.DisplayAlertAsync(AppResources.LogInRequested, string.Format(AppResources.LoginAttemptFromXDoYouWantToSwitchToThisAccount, notificationUserEmail), AppResources.Cancel, AppResources.Ok);
+                    if (result == AppResources.Ok)
+                    {
+                        await _stateService.SetActiveUserAsync(notification.UserId);
+                        _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
                 }
             });
             return true;
@@ -242,7 +261,7 @@ namespace Bit.App
             }
             if (_pendingCheckPasswordlessLoginRequests)
             {
-                CheckPasswordlessLoginRequestsAsync().FireAndForget();
+                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
             }
             if (Device.RuntimePlatform == Device.Android)
             {
@@ -278,7 +297,7 @@ namespace Bit.App
             _isResumed = true;
             if (_pendingCheckPasswordlessLoginRequests)
             {
-                CheckPasswordlessLoginRequestsAsync().FireAndForget();
+                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
             }
             if (Device.RuntimePlatform == Device.Android)
             {
@@ -440,7 +459,14 @@ namespace Bit.App
             switch (navTarget)
             {
                 case NavigationTarget.HomeLogin:
-                    Current.MainPage = new NavigationPage(new HomePage(Options));
+                    if (navParams is HomeNavigationParams homeParams)
+                    {
+                        Current.MainPage = new NavigationPage(new HomePage(Options, homeParams.ShouldCheckRememberEmail));
+                    }
+                    else
+                    {
+                        Current.MainPage = new NavigationPage(new HomePage(Options));
+                    }
                     break;
                 case NavigationTarget.Login:
                     if (navParams is LoginNavigationParams loginParams)

src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs

@@ -14,7 +14,7 @@ namespace Bit.App.Controls
         {
             AccountView = accountView;
             AvatarImageSource = ServiceContainer.Resolve<IAvatarImageSourcePool>("avatarImageSourcePool")
-                                                ?.GetOrCreateAvatar(AccountView.Name, AccountView.Email);
+                ?.GetOrCreateAvatar(AccountView.UserId, AccountView.Name, AccountView.Email);
         }
 
         public AccountView AccountView

src/App/Controls/AvatarImageSource.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Bit.Core.Utilities;
 using SkiaSharp;
 using Xamarin.Forms;
 
@@ -10,7 +11,8 @@ namespace Bit.App.Controls
 {
     public class AvatarImageSource : StreamImageSource
     {
-        private string _data;
+        private readonly string _text;
+        private readonly string _id;
 
         public override bool Equals(object obj)
         {
@@ -21,20 +23,21 @@ namespace Bit.App.Controls
 
             if (obj is AvatarImageSource avatar)
             {
-                return avatar._data == _data;
+                return avatar._id == _id && avatar._text == _text;
             }
 
             return base.Equals(obj);
         }
 
-        public override int GetHashCode() => _data?.GetHashCode() ?? -1;
+        public override int GetHashCode() => _id?.GetHashCode() ?? _text?.GetHashCode() ?? -1;
 
-        public AvatarImageSource(string name = null, string email = null)
+        public AvatarImageSource(string userId = null, string name = null, string email = null)
         {
-            _data = name;
-            if (string.IsNullOrWhiteSpace(_data))
+            _id = userId;
+            _text = name;
+            if (string.IsNullOrWhiteSpace(_text))
             {
-                _data = email;
+                _text = email;
             }
         }
 
@@ -52,24 +55,24 @@ namespace Bit.App.Controls
         private Stream Draw()
         {
             string chars;
-            string upperData = null;
+            string upperCaseText = null;
 
-            if (string.IsNullOrEmpty(_data))
+            if (string.IsNullOrEmpty(_text))
             {
                 chars = "..";
             }
-            else if (_data?.Length > 1)
+            else if (_text?.Length > 1)
             {
-                upperData = _data.ToUpper();
-                chars = GetFirstLetters(upperData, 2);
+                upperCaseText = _text.ToUpper();
+                chars = GetFirstLetters(upperCaseText, 2);
             }
             else
             {
-                chars = upperData = _data.ToUpper();
+                chars = upperCaseText = _text.ToUpper();
             }
 
-            var bgColor = StringToColor(upperData);
-            var textColor = Color.White;
+            var bgColor = CoreHelpers.StringToColor(_id ?? upperCaseText, "#33ffffff");
+            var textColor = CoreHelpers.TextColorFromBgColor(bgColor);
             var size = 50;
 
             using (var bitmap = new SKBitmap(size * 2,
@@ -85,7 +88,7 @@ namespace Bit.App.Controls
                         IsAntialias = true,
                         Style = SKPaintStyle.Fill,
                         StrokeJoin = SKStrokeJoin.Miter,
-                        Color = SKColor.Parse(bgColor.ToHex())
+                        Color = SKColor.Parse(bgColor)
                     })
                     {
                         var midX = canvas.LocalClipBounds.Size.ToSizeI().Width / 2;
@@ -97,7 +100,7 @@ namespace Bit.App.Controls
                             IsAntialias = true,
                             Style = SKPaintStyle.Fill,
                             StrokeJoin = SKStrokeJoin.Miter,
-                            Color = SKColor.Parse(bgColor.ToHex())
+                            Color = SKColor.Parse(bgColor)
                         })
                         {
                             canvas.DrawCircle(midX, midY, radius, circlePaint);
@@ -108,7 +111,7 @@ namespace Bit.App.Controls
                             {
                                 IsAntialias = true,
                                 Style = SKPaintStyle.Fill,
-                                Color = SKColor.Parse(textColor.ToHex()),
+                                Color = SKColor.Parse(textColor),
                                 TextSize = textSize,
                                 TextAlign = SKTextAlign.Center,
                                 Typeface = typeface

src/App/Controls/AvatarImageSourcePool.cs

@@ -5,19 +5,19 @@ namespace Bit.App.Controls
 {
     public interface IAvatarImageSourcePool
     {
-        AvatarImageSource GetOrCreateAvatar(string name, string email);
+        AvatarImageSource GetOrCreateAvatar(string userId, string name, string email);
     }
 
     public class AvatarImageSourcePool : IAvatarImageSourcePool
     {
         private readonly ConcurrentDictionary<string, AvatarImageSource> _cache = new ConcurrentDictionary<string, AvatarImageSource>();
 
-        public AvatarImageSource GetOrCreateAvatar(string name, string email)
+        public AvatarImageSource GetOrCreateAvatar(string userId, string name, string email)
         {
-            var key = $"{name}{email}";
+            var key = $"{userId}{name}{email}";
             if (!_cache.TryGetValue(key, out var avatar))
             {
-                avatar = new AvatarImageSource(name, email);
+                avatar = new AvatarImageSource(userId, name, email);
                 if (!_cache.TryAdd(key, avatar)
                     &&
                     !_cache.TryGetValue(key, out avatar)) // If add fails another thread created the avatar in between the first try get and the try add.

src/App/Controls/CircularProgressbarView.cs

@@ -21,13 +21,13 @@ namespace Bit.App.Controls
             nameof(StrokeWidth), typeof(float), typeof(CircularProgressbarView), 3f);
 
         public static readonly BindableProperty ProgressColorProperty = BindableProperty.Create(
-            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
+            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromHex("175DDC"));
 
         public static readonly BindableProperty EndingProgressColorProperty = BindableProperty.Create(
-            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
+            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromHex("dd4b39"));
 
         public static readonly BindableProperty BackgroundProgressColorProperty = BindableProperty.Create(
-            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
+            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.White);
 
         public double Progress
         {

src/App/Controls/ExtendedSlider.cs

@@ -5,7 +5,7 @@ namespace Bit.App.Controls
     public class ExtendedSlider : Slider
     {
         public static readonly BindableProperty ThumbBorderColorProperty = BindableProperty.Create(
-            nameof(ThumbBorderColor), typeof(Color), typeof(ExtendedSlider), Color.Default);
+            nameof(ThumbBorderColor), typeof(Color), typeof(ExtendedSlider), Color.FromHex("b5b5b5"));
 
         public Color ThumbBorderColor
         {

src/App/Controls/ExtendedStepper.cs

@@ -5,10 +5,10 @@ namespace Bit.App.Controls
     public class ExtendedStepper : Stepper
     {
         public static readonly BindableProperty StepperBackgroundColorProperty = BindableProperty.Create(
-            nameof(StepperBackgroundColor), typeof(Color), typeof(ExtendedStepper), Color.Default);
+            nameof(StepperBackgroundColor), typeof(Color), typeof(ExtendedStepper), Color.White);
 
         public static readonly BindableProperty StepperForegroundColorProperty = BindableProperty.Create(
-            nameof(StepperForegroundColor), typeof(Color), typeof(ExtendedStepper), Color.Default);
+            nameof(StepperForegroundColor), typeof(Color), typeof(ExtendedStepper), Color.Black);
 
         public Color StepperBackgroundColor
         {

src/App/Controls/IconButton.cs

@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Bit.App.Effects;
+using Xamarin.Forms;
 
 namespace Bit.App.Controls
 {
@@ -16,6 +17,8 @@ namespace Bit.App.Controls
                     FontFamily = "bwi-font.ttf#bwi-font";
                     break;
             }
+
+            Effects.Add(new RemoveFontPaddingEffect());
         }
     }
 }

src/App/Controls/IconLabel.cs

@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Bit.App.Effects;
+using Xamarin.Forms;
 
 namespace Bit.App.Controls
 {
@@ -17,6 +18,8 @@ namespace Bit.App.Controls
                     FontFamily = "bwi-font.ttf#bwi-font";
                     break;
             }
+
+            Effects.Add(new RemoveFontPaddingEffect());
         }
     }
 }

src/App/Controls/IconLabelButton/IconLabelButton.xaml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Frame xmlns="http://xamarin.com/schemas/2014/forms" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Bit.App.Controls.IconLabelButton"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    x:Name="_iconLabelButton"
+    HeightRequest="45"
+    Padding="1"
+    StyleClass="btn-icon-secondary"
+    BackgroundColor="{Binding IconLabelBorderColor, Source={x:Reference _iconLabelButton}}"
+    BorderColor="Transparent"
+    HasShadow="False">
+    <Frame.GestureRecognizers>
+        <TapGestureRecognizer Command="{Binding ButtonCommand, Source={x:Reference _iconLabelButton}}" />
+    </Frame.GestureRecognizers>
+    <Frame
+        Margin="0"
+        Padding="0"
+        CornerRadius="{Binding CornerRadius, Source={x:Reference _iconLabelButton}}"
+        BackgroundColor="{Binding IconLabelBackgroundColor, Source={x:Reference _iconLabelButton}}"
+        BorderColor="Transparent"
+        IsClippedToBounds="True"
+        HasShadow="False">
+        <StackLayout
+            Orientation="Horizontal"
+            HorizontalOptions="Center">
+            <controls:IconLabel
+                VerticalOptions="Center"
+                HorizontalTextAlignment="Center"
+                FontSize="Large"
+                TextColor="{Binding IconLabelColor, Source={x:Reference _iconLabelButton}}"
+                Text="{Binding Icon, Source={x:Reference _iconLabelButton}}">
+            </controls:IconLabel>
+            <Label
+                VerticalOptions="Center"
+                HorizontalTextAlignment="Center"
+                TextColor="{Binding IconLabelColor, Source={x:Reference _iconLabelButton}}"
+                FontSize="Medium"
+                Text="{Binding Label, Source={x:Reference _iconLabelButton}}"/>
+        </StackLayout>
+    </Frame>
+</Frame>

src/App/Controls/IconLabelButton/IconLabelButton.xaml.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.Core.Models.Domain;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Bit.App.Controls
+{
+    public partial class IconLabelButton : Frame
+    {
+        public static readonly BindableProperty IconProperty = BindableProperty.Create(
+            nameof(Icon), typeof(string), typeof(IconLabelButton));
+
+        public static readonly BindableProperty LabelProperty = BindableProperty.Create(
+            nameof(Label), typeof(string), typeof(IconLabelButton));
+
+        public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
+            nameof(ButtonCommand), typeof(ICommand), typeof(IconLabelButton));
+
+        public static readonly BindableProperty IconLabelColorProperty = BindableProperty.Create(
+            nameof(IconLabelColor), typeof(Color), typeof(IconLabelButton), Color.White);
+
+        public static readonly BindableProperty IconLabelBackgroundColorProperty = BindableProperty.Create(
+            nameof(IconLabelBackgroundColor), typeof(Color), typeof(IconLabelButton), Color.White);
+
+        public static readonly BindableProperty IconLabelBorderColorProperty = BindableProperty.Create(
+            nameof(IconLabelBorderColor), typeof(Color), typeof(IconLabelButton), Color.White);
+
+        public IconLabelButton()
+        {
+            InitializeComponent();
+        }
+
+        public string Icon
+        {
+            get => GetValue(IconProperty) as string;
+            set => SetValue(IconProperty, value);
+        }
+
+        public string Label
+        {
+            get => GetValue(LabelProperty) as string;
+            set => SetValue(LabelProperty, value);
+        }
+
+        public ICommand ButtonCommand
+        {
+            get => GetValue(ButtonCommandProperty) as ICommand;
+            set => SetValue(ButtonCommandProperty, value);
+        }
+
+        public Color IconLabelColor
+        {
+            get { return (Color)GetValue(IconLabelColorProperty); }
+            set { SetValue(IconLabelColorProperty, value); }
+        }
+
+        public Color IconLabelBackgroundColor
+        {
+            get { return (Color)GetValue(IconLabelBackgroundColorProperty); }
+            set { SetValue(IconLabelBackgroundColorProperty, value); }
+        }
+
+        public Color IconLabelBorderColor
+        {
+            get { return (Color)GetValue(IconLabelBorderColorProperty); }
+            set { SetValue(IconLabelBorderColorProperty, value); }
+        }
+    }
+}
+

src/App/Effects/RemoveFontPaddingEffect.cs

@@ -0,0 +1,13 @@
+using System;
+using Xamarin.Forms;
+
+namespace Bit.App.Effects
+{
+    public class RemoveFontPaddingEffect : RoutingEffect
+    {
+        public RemoveFontPaddingEffect()
+            : base("Bitwarden.RemoveFontPaddingEffect")
+        { }
+    }
+}
+

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

@@ -6,11 +6,12 @@ namespace Bit.App.Pages
     {
         private HintPageViewModel _vm;
 
-        public HintPage()
+        public HintPage(string email = null)
         {
             InitializeComponent();
             _vm = BindingContext as HintPageViewModel;
             _vm.Page = this;
+            _vm.Email = email;
             if (Device.RuntimePlatform == Device.Android)
             {
                 ToolbarItems.RemoveAt(0);

src/App/Pages/Accounts/HintPageViewModel.cs

@@ -15,6 +15,7 @@ namespace Bit.App.Pages
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IApiService _apiService;
         private readonly ILogger _logger;
+        private string _email;
 
         public HintPageViewModel()
         {
@@ -34,7 +35,12 @@ namespace Bit.App.Pages
         }
 
         public ICommand SubmitCommand { get; }
-        public string Email { get; set; }
+
+        public string Email
+        {
+            get => _email;
+            set => SetProperty(ref _email, value);
+        }
 
         public async Task SubmitAsync()
         {

src/App/Pages/Accounts/HomePage.xaml

@@ -24,6 +24,7 @@
             UseOriginalImage="True"
             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"
@@ -32,30 +33,68 @@
 
     <ContentPage.Resources>
         <ResourceDictionary>
-            <StackLayout x:Name="_mainLayout" x:Key="mainLayout" Spacing="0" Padding="10, 5">
-                <StackLayout VerticalOptions="CenterAndExpand" Spacing="20">
-                    <Image
-                        x:Name="_logo"
-                        Source="logo.png"
-                        VerticalOptions="Center" />
-                    <Label Text="{u:I18n LoginOrCreateNewAccount}"
-                           StyleClass="text-lg"
-                           HorizontalTextAlignment="Center">
-                    </Label>
-                    <StackLayout Spacing="5">
-                        <Button Text="{u:I18n LogIn}"
-                                StyleClass="btn-primary"
-                                Clicked="LogIn_Clicked" />
-                        <Button Text="{u:I18n CreateAccount}"
-                                Clicked="Register_Clicked" />
-                        <Button Text="{u:I18n LogInSso}"
-                                Clicked="LogInSso_Clicked" />
-                        <Button Text="{u:I18n Cancel}"
-                                IsVisible="{Binding ShowCancelButton}"
-                                Margin="0,10,0,0"
-                                Clicked="Cancel_Clicked" />
+            <u:InverseBoolConverter x:Key="inverseBool" />
+            <StackLayout x:Name="_mainLayout" x:Key="mainLayout" Spacing="30" Padding="20, 50, 20, 0">
+                <Image
+                    x:Name="_logo"
+                    Source="logo.png"
+                    VerticalOptions="Center" />
+                <Label Text="{u:I18n LoginOrCreateNewAccount}"
+                        StyleClass="text-lg"
+                        HorizontalTextAlignment="Center"/>
+                <StackLayout
+                    StyleClass="box-row">
+                    <Label
+                        Text="{u:I18n EmailAddress}"
+                        StyleClass="box-label" />
+                    <Entry
+                        x:Name="_email"
+                        Text="{Binding Email}"
+                        Keyboard="Email"
+                        StyleClass="box-value"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding ContinueCommand}">
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Property="TextColor" Value="{DynamicResource MutedColor}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Entry>
+                    <StackLayout
+                        Orientation="Horizontal"
+                        Margin="0, 16, 0 ,0">
+                        <StackLayout.GestureRecognizers>
+                            <TapGestureRecognizer
+                                Command="{Binding RememberEmailCommand}" />
+                        </StackLayout.GestureRecognizers>
+                        <Label
+                            Text="{u:I18n RememberMe}"
+                            StyleClass="text-sm"
+                            HorizontalOptions="FillAndExpand"
+                            VerticalOptions="Center"
+                            VerticalTextAlignment="Center"/>
+                        <Switch
+                            Scale="0.8"
+                            IsToggled="{Binding RememberEmail}"
+                            VerticalOptions="Center"/>
                     </StackLayout>
                 </StackLayout>
+                <Button Text="{u:I18n Continue}"
+                        StyleClass="btn-primary"
+                        IsEnabled="{Binding CanContinue}"
+                        Command="{Binding ContinueCommand}" />
+                        
+                <Label FormattedText="{Binding CreateAccountText}"
+                       Margin="0, 10"
+                        StyleClass="box-footer-label">
+                    <Label.GestureRecognizers>
+                        <TapGestureRecognizer Command="{Binding CreateAccountCommand}" />
+                    </Label.GestureRecognizers>
+                </Label>
             </StackLayout>
         </ResourceDictionary>
     </ContentPage.Resources>

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

@@ -10,28 +10,35 @@ namespace Bit.App.Pages
 {
     public partial class HomePage : BaseContentPage
     {
+        private bool _checkRememberedEmail;
         private readonly HomeViewModel _vm;
         private readonly AppOptions _appOptions;
         private IBroadcasterService _broadcasterService;
 
-        public HomePage(AppOptions appOptions = null)
+        public HomePage(AppOptions appOptions = null, bool shouldCheckRememberEmail = true)
         {
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _appOptions = appOptions;
             InitializeComponent();
             _vm = BindingContext as HomeViewModel;
             _vm.Page = this;
-            _vm.StartLoginAction = () => Device.BeginInvokeOnMainThread(async () => await StartLoginAsync());
+            _vm.ShouldCheckRememberEmail = shouldCheckRememberEmail;
+            _vm.ShowCancelButton = _appOptions?.IosExtension ?? false;
+            _vm.StartLoginAction = async () => await StartLoginAsync();
             _vm.StartRegisterAction = () => Device.BeginInvokeOnMainThread(async () => await StartRegisterAsync());
             _vm.StartSsoLoginAction = () => Device.BeginInvokeOnMainThread(async () => await StartSsoLoginAsync());
             _vm.StartEnvironmentAction = () => Device.BeginInvokeOnMainThread(async () => await StartEnvironmentAsync());
+            _vm.CloseAction = async () =>
+            {
+                await _accountListOverlay.HideAsync();
+                await Navigation.PopModalAsync();
+            };
             UpdateLogo();
 
-            if (_appOptions?.IosExtension ?? false)
+            if (!_vm.ShowCancelButton)
             {
-                _vm.ShowCancelButton = true;
+                ToolbarItems.Remove(_closeButton);
             }
-
             if (_appOptions?.HideAccountSwitcher ?? false)
             {
                 ToolbarItems.Remove(_accountAvatar);
@@ -52,7 +59,7 @@ namespace Bit.App.Pages
 
             if (!_appOptions?.HideAccountSwitcher ?? false)
             {
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
+                _vm.AvatarImageSource = await GetAvatarImageSourceAsync(false);
             }
             _broadcasterService.Subscribe(nameof(HomePage), (message) =>
             {
@@ -64,6 +71,8 @@ namespace Bit.App.Pages
                     });
                 }
             });
+
+            _vm.CheckNavigateLoginStep();
         }
 
         protected override bool OnBackButtonPressed()
@@ -96,28 +105,12 @@ namespace Bit.App.Pages
             }
         }
 
-        private void LogIn_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                _vm.StartLoginAction();
-            }
-        }
-
         private async Task StartLoginAsync()
         {
-            var page = new LoginPage(null, _appOptions);
+            var page = new LoginPage(_vm.Email, _appOptions);
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
 
-        private void Register_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                _vm.StartRegisterAction();
-            }
-        }
-
         private async Task StartRegisterAsync()
         {
             var page = new RegisterPage(this);

src/App/Pages/Accounts/HomePageViewModel.cs

@@ -1,8 +1,15 @@
 using System;
+using System.Threading.Tasks;
+using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
+using Bit.App.Utilities;
 using Bit.Core.Abstractions;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
+using Xamarin.Essentials;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -12,19 +19,37 @@ namespace Bit.App.Pages
         private readonly IMessagingService _messagingService;
 
         private bool _showCancelButton;
+        private bool _rememberEmail;
+        private string _email;
+        private bool _isEmailEnabled;
+        private bool _canLogin;
+        private IPlatformUtilsService _platformUtilsService;
+        private ILogger _logger;
+        private IEnvironmentService _environmentService;
+        private IAccountsManager _accountManager;
 
         public HomeViewModel()
         {
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            var logger = ServiceContainer.Resolve<ILogger>("logger");
+            _stateService = ServiceContainer.Resolve<IStateService>();
+            _messagingService = ServiceContainer.Resolve<IMessagingService>();
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
+            _logger = ServiceContainer.Resolve<ILogger>();
+            _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
+            _accountManager = ServiceContainer.Resolve<IAccountsManager>();
 
             PageTitle = AppResources.Bitwarden;
 
-            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, logger)
+            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
             {
                 AllowActiveAccountSelection = true
             };
+            RememberEmailCommand = new Command(() => RememberEmail = !RememberEmail);
+            ContinueCommand = new AsyncCommand(ContinueToLoginStepAsync, allowsMultipleExecutions: false);
+            CreateAccountCommand = new AsyncCommand(async () => await Device.InvokeOnMainThreadAsync(StartRegisterAction),
+                onException: _logger.Exception, allowsMultipleExecutions: false);
+            CloseCommand = new AsyncCommand(async () => await Device.InvokeOnMainThreadAsync(CloseAction),
+                onException: _logger.Exception, allowsMultipleExecutions: false);
+            InitAsync().FireAndForget();
         }
 
         public bool ShowCancelButton
@@ -33,11 +58,102 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showCancelButton, value);
         }
 
+        public bool RememberEmail
+        {
+            get => _rememberEmail;
+            set => SetProperty(ref _rememberEmail, value);
+        }
+
+        public string Email
+        {
+            get => _email;
+            set => SetProperty(ref _email, value,
+                additionalPropertyNames: new[] { nameof(CanContinue) });
+        }
+
+        public bool CanContinue => !string.IsNullOrEmpty(Email);
+
+        public bool ShouldCheckRememberEmail { get; set; }
+
+        public FormattedString CreateAccountText
+        {
+            get
+            {
+                var fs = new FormattedString();
+                fs.Spans.Add(new Span
+                {
+                    Text = $"{AppResources.NewAroundHere} "
+                });
+                fs.Spans.Add(new Span
+                {
+                    Text = AppResources.CreateAccount,
+                    TextColor = ThemeManager.GetResourceColor("PrimaryColor")
+                });
+                return fs;
+            }
+        }
+
         public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
         public Action StartLoginAction { get; set; }
         public Action StartRegisterAction { get; set; }
         public Action StartSsoLoginAction { get; set; }
         public Action StartEnvironmentAction { get; set; }
         public Action CloseAction { get; set; }
+        public Command RememberEmailCommand { get; set; }
+        public AsyncCommand ContinueCommand { get; }
+        public AsyncCommand CloseCommand { get; }
+        public AsyncCommand CreateAccountCommand { get; }
+
+        public async Task InitAsync()
+        {
+            Email = await _stateService.GetRememberedEmailAsync();
+            RememberEmail = !string.IsNullOrEmpty(Email);
+        }
+
+        public void CheckNavigateLoginStep()
+        {
+            if (ShouldCheckRememberEmail && RememberEmail)
+            {
+                StartLoginAction();
+            }
+            ShouldCheckRememberEmail = false;
+        }
+
+        public async Task ContinueToLoginStepAsync()
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(Email))
+                {
+                    await _platformUtilsService.ShowDialogAsync(
+                        string.Format(AppResources.ValidationFieldRequired, AppResources.EmailAddress),
+                        AppResources.AnErrorHasOccurred, AppResources.Ok);
+                    return;
+                }
+                if (!Email.Contains("@"))
+                {
+                    await _platformUtilsService.ShowDialogAsync(AppResources.InvalidEmail, AppResources.AnErrorHasOccurred,
+                        AppResources.Ok);
+                    return;
+                }
+                await _stateService.SetRememberedEmailAsync(RememberEmail ? Email : null);
+                var userId = await _stateService.GetUserIdAsync(Email);
+                if (!string.IsNullOrWhiteSpace(userId))
+                {
+                    var userEnvUrls = await _stateService.GetEnvironmentUrlsAsync(userId);
+                    if (userEnvUrls?.Base == _environmentService.BaseUrl)
+                    {
+                        await _accountManager.PromptToSwitchToExistingAccountAsync(userId);
+                        return;
+                    }
+                }
+                StartLoginAction();
+            }
+            catch (Exception ex)
+            {
+                _logger.Exception(ex);
+                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage, AppResources.AnErrorHasOccurred, AppResources.Ok);
+            }
+        }
     }
 }

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -28,6 +28,7 @@ namespace Bit.App.Pages
         private readonly IBiometricService _biometricService;
         private readonly IKeyConnectorService _keyConnectorService;
         private readonly ILogger _logger;
+        private readonly IWatchDeviceService _watchDeviceService;
         private readonly WeakEventManager<int?> _secretEntryFocusWeakEventManager = new WeakEventManager<int?>();
 
         private string _email;
@@ -56,6 +57,7 @@ namespace Bit.App.Pages
             _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
             _logger = ServiceContainer.Resolve<ILogger>("logger");
+            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
 
             PageTitle = AppResources.VerifyMasterPassword;
             TogglePasswordCommand = new Command(TogglePassword);
@@ -387,6 +389,7 @@ namespace Bit.App.Pages
         private async Task DoContinueAsync()
         {
             await _stateService.SetBiometricLockedAsync(false);
+            _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
             _messagingService.Send("unlocked");
             UnlockedAction?.Invoke();
         }

src/App/Pages/Accounts/LoginPage.xaml

@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Bit.App.Pages.LoginPage"
     xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
     xmlns:controls="clr-namespace:Bit.App.Controls"
     xmlns:u="clr-namespace:Bit.App.Utilities"
     x:DataType="pages:LoginPageViewModel"
@@ -46,33 +47,13 @@
                 Order="Secondary" />
 
             <ScrollView x:Name="_mainLayout" x:Key="mainLayout">
-                <StackLayout Spacing="20">
+                <StackLayout Spacing="0">
                     <StackLayout StyleClass="box">
-                        <StackLayout StyleClass="box-row">
-                            <Label
-                                Text="{u:I18n EmailAddress}"
-                                StyleClass="box-label" />
-                            <Entry
-                                x:Name="_email"
-                                Text="{Binding Email}"
-                                IsEnabled="{Binding IsEmailEnabled}"
-                                Keyboard="Email"
-                                StyleClass="box-value">
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="CommonStates">
-                                        <VisualState x:Name="Disabled">
-                                            <VisualState.Setters>
-                                                <Setter Property="TextColor" Value="{DynamicResource MutedColor}" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                                </Entry>
-                        </StackLayout>
                         <Grid StyleClass="box-row">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
+                                <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
@@ -81,6 +62,7 @@
                             <Label
                                 Text="{u:I18n MasterPassword}"
                                 StyleClass="box-label"
+                                Padding="0, 10, 0, 0"
                                 Grid.Row="0"
                                 Grid.Column="0" />
                             <controls:MonoEntry
@@ -98,21 +80,60 @@
                                 StyleClass="box-row-button, box-row-button-platform"
                                 Text="{Binding ShowPasswordIcon}"
                                 Command="{Binding TogglePasswordCommand}"
-                                Grid.Row="0"
+                                Grid.Row="1"
                                 Grid.Column="1"
-                                Grid.RowSpan="2"
+                                Grid.RowSpan="1"
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                 AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
+                            <Label
+                                Text="{u:I18n GetMasterPasswordwordHint}"
+                                StyleClass="box-footer-label"
+                                TextColor="{DynamicResource HyperlinkColor}"
+                                Padding="0,5,0,0"
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2">
+                                <Label.GestureRecognizers>
+                                    <TapGestureRecognizer Tapped="Hint_Clicked" />
+                                </Label.GestureRecognizers>
+                            </Label>
                         </Grid>
                     </StackLayout>
-                    <StackLayout Padding="10, 0">
-                        <Button Text="{u:I18n LogIn}" 
+                    <StackLayout Padding="10, 10">
+                        <Button x:Name="_loginWithMasterPassword"
+                            Text="{u:I18n LogInWithMasterPassword}" 
                                 StyleClass="btn-primary"
                                 Clicked="LogIn_Clicked" />
-                        <Button Text="{u:I18n Cancel}"
-                                IsVisible="{Binding ShowCancelButton}"
-                                Clicked="Cancel_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}"/>
+                        <controls:IconLabelButton
+                            HorizontalOptions="Fill"
+                            VerticalOptions="CenterAndExpand"
+                            Icon="{Binding Source={x:Static core:BitwardenIcons.Suitcase}}"
+                            Label="{u:I18n LogInSso}">
+                            <controls:IconLabelButton.GestureRecognizers>
+                                <TapGestureRecognizer Tapped="LogInSSO_Clicked" />
+                            </controls:IconLabelButton.GestureRecognizers>
+                        </controls:IconLabelButton>
+                        <Label
+                            Text="{Binding LoggingInAsText}"
+                            StyleClass="text-sm"
+                            Margin="0,40,0,0"/>
+                        <Label
+                            Text="{u:I18n NotYou}"
+                            StyleClass="text-md"
+                            HorizontalOptions="Start"
+                            TextColor="{DynamicResource HyperlinkColor}">
+                            <Label.GestureRecognizers>
+                                <TapGestureRecognizer Tapped="Cancel_Clicked" />
+                            </Label.GestureRecognizers>
+                        </Label>
                     </StackLayout>
                 </StackLayout>
             </ScrollView>

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

@@ -3,7 +3,9 @@ using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -25,8 +27,9 @@ namespace Bit.App.Pages
             _vm.Page = this;
             _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
             _vm.LogInSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await LogInSuccessAsync());
-            _vm.UpdateTempPasswordAction =
-                () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
+            _vm.LogInWithDeviceAction = () => StartLoginWithDeviceAsync().FireAndForget();
+            _vm.StartSsoLoginAction = () => Device.BeginInvokeOnMainThread(async () => await StartSsoLoginAsync());
+            _vm.UpdateTempPasswordAction = () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
             _vm.CloseAction = async () =>
             {
                 await _accountListOverlay.HideAsync();
@@ -42,9 +45,6 @@ namespace Bit.App.Pages
             _vm.Email = email;
             MasterPasswordEntry = _masterPassword;
 
-            _email.ReturnType = ReturnType.Next;
-            _email.ReturnCommand = new Command(() => _masterPassword.Focus());
-
             if (Device.RuntimePlatform == Device.iOS)
             {
                 ToolbarItems.Add(_moreItem);
@@ -54,11 +54,6 @@ namespace Bit.App.Pages
                 ToolbarItems.Add(_getPasswordHint);
             }
 
-            if (Device.RuntimePlatform == Device.Android && !_vm.IsEmailEnabled)
-            {
-                ToolbarItems.Add(_removeAccount);
-            }
-
             if (_appOptions?.IosExtension ?? false)
             {
                 _vm.ShowCancelButton = true;
@@ -78,16 +73,20 @@ namespace Bit.App.Pages
             _mainContent.Content = _mainLayout;
             _accountAvatar?.OnAppearing();
 
+            await _vm.InitAsync();
             if (!_appOptions?.HideAccountSwitcher ?? false)
             {
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
+                _vm.AvatarImageSource = await GetAvatarImageSourceAsync(_vm.EmailIsInSavedAccounts);
             }
-            await _vm.InitAsync();
             if (!_inputFocused)
             {
-                RequestFocus(string.IsNullOrWhiteSpace(_vm.Email) ? _email : _masterPassword);
+                RequestFocus(_masterPassword);
                 _inputFocused = true;
             }
+            if (Device.RuntimePlatform == Device.Android && !_vm.CanRemoveAccount)
+            {
+                ToolbarItems.Add(_removeAccount);
+            }
         }
 
         protected override bool OnBackButtonPressed()
@@ -115,11 +114,31 @@ namespace Bit.App.Pages
             }
         }
 
+        private void LogInSSO_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.StartSsoLoginAction();
+            }
+        }
+
+        private async Task StartLoginWithDeviceAsync()
+        {
+            var page = new LoginPasswordlessRequestPage(_vm.Email, _appOptions);
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
+        private async Task StartSsoLoginAsync()
+        {
+            var page = new LoginSsoPage(_appOptions);
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
         private void Hint_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
             {
-                Navigation.PushModalAsync(new NavigationPage(new HintPage()));
+                _vm.ShowMasterPasswordHintAsync().FireAndForget();
             }
         }
 

src/App/Pages/Accounts/LoginPageViewModel.cs

@@ -1,13 +1,19 @@
 using System;
+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.App.Utilities.AccountManagement;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
+using Bit.Core.Models.View;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
@@ -25,12 +31,15 @@ namespace Bit.App.Pages
         private readonly II18nService _i18nService;
         private readonly IMessagingService _messagingService;
         private readonly ILogger _logger;
-
+        private readonly IApiService _apiService;
+        private readonly IAppIdService _appIdService;
+        private readonly IAccountsManager _accountManager;
         private bool _showPassword;
         private bool _showCancelButton;
         private string _email;
         private string _masterPassword;
         private bool _isEmailEnabled;
+        private bool _isKnownDevice;
 
         public LoginPageViewModel()
         {
@@ -43,11 +52,15 @@ namespace Bit.App.Pages
             _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _logger = ServiceContainer.Resolve<ILogger>("logger");
+            _apiService = ServiceContainer.Resolve<IApiService>();
+            _appIdService = ServiceContainer.Resolve<IAppIdService>();
+            _accountManager = ServiceContainer.Resolve<IAccountsManager>();
 
             PageTitle = AppResources.Bitwarden;
             TogglePasswordCommand = new Command(TogglePassword);
             LogInCommand = new Command(async () => await LogInAsync());
             MoreCommand = new AsyncCommand(MoreAsync, onException: _logger.Exception, allowsMultipleExecutions: false);
+            LogInWithDeviceCommand = new AsyncCommand(() => Device.InvokeOnMainThreadAsync(LogInWithDeviceAction), onException: _logger.Exception, allowsMultipleExecutions: false);
 
             AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
             {
@@ -76,7 +89,11 @@ namespace Bit.App.Pages
         public string Email
         {
             get => _email;
-            set => SetProperty(ref _email, value);
+            set => SetProperty(ref _email, value,
+                additionalPropertyNames: new string[]
+                {
+                    nameof(LoggingInAsText)
+                });
         }
 
         public string MasterPassword
@@ -91,20 +108,31 @@ namespace Bit.App.Pages
             set => SetProperty(ref _isEmailEnabled, value);
         }
 
-        public bool IsIosExtension { get; set; }
+        public bool IsKnownDevice
+        {
+            get => _isKnownDevice;
+            set => SetProperty(ref _isKnownDevice, value);
+        }
 
         public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
-
         public Command LogInCommand { get; }
         public Command TogglePasswordCommand { get; }
         public ICommand MoreCommand { get; internal set; }
+        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.LoggingInAsX, Email);
+        public bool IsIosExtension { get; set; }
+        public bool CanRemoveAccount { get; set; }
         public Action StartTwoFactorAction { get; set; }
         public Action LogInSuccessAction { get; set; }
+        public Action LogInWithDeviceAction { get; set; }
         public Action UpdateTempPasswordAction { get; set; }
+        public Action StartSsoLoginAction { get; set; }
         public Action CloseAction { get; set; }
 
+        public bool EmailIsInSavedAccounts => _stateService.AccountViews != null && _stateService.AccountViews.Any(e => e.Email == Email);
+
         protected override II18nService i18nService => _i18nService;
         protected override IEnvironmentService environmentService => _environmentService;
         protected override IDeviceActionService deviceActionService => _deviceActionService;
@@ -112,9 +140,23 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            if (string.IsNullOrWhiteSpace(Email))
+            try
             {
-                Email = await _stateService.GetRememberedEmailAsync();
+                await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
+                await AccountSwitchingOverlayViewModel.RefreshAccountViewsAsync();
+                if (string.IsNullOrWhiteSpace(Email))
+                {
+                    Email = await _stateService.GetRememberedEmailAsync();
+                }
+                var deviceIdentifier = await _appIdService.GetAppIdAsync();
+                // TODO uncomment to enable login with device
+                //IsKnownDevice = await _apiService.GetKnownDeviceAsync(Email, deviceIdentifier);
+                CanRemoveAccount = await _stateService.GetActiveUserEmailAsync() != Email;
+                await _deviceActionService.HideLoadingAsync();
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
             }
         }
 
@@ -158,7 +200,7 @@ namespace Bit.App.Pages
                         var userEnvUrls = await _stateService.GetEnvironmentUrlsAsync(userId);
                         if (userEnvUrls?.Base == _environmentService.BaseUrl)
                         {
-                            await PromptToSwitchToExistingAccountAsync(userId);
+                            await _accountManager.PromptToSwitchToExistingAccountAsync(userId);
                             return;
                         }
                     }
@@ -170,7 +212,6 @@ namespace Bit.App.Pages
                 }
 
                 var response = await _authService.LogInAsync(Email, MasterPassword, _captchaToken);
-                await _stateService.SetRememberedEmailAsync(Email);
                 await AppHelpers.ResetInvalidUnlockAttemptsAsync();
 
                 if (response.CaptchaNeeded)
@@ -216,19 +257,14 @@ namespace Bit.App.Pages
 
         private async Task MoreAsync()
         {
-            var buttons = IsEmailEnabled
+            var buttons = IsEmailEnabled || CanRemoveAccount
                 ? new[] { AppResources.GetPasswordHint }
                 : new[] { AppResources.GetPasswordHint, AppResources.RemoveAccount };
             var selection = await _deviceActionService.DisplayActionSheetAsync(AppResources.Options, AppResources.Cancel, null, buttons);
 
             if (selection == AppResources.GetPasswordHint)
             {
-                var hintNavigationPage = new NavigationPage(new HintPage());
-                if (IsIosExtension)
-                {
-                    ThemeManager.ApplyResourcesTo(hintNavigationPage);
-                }
-                await Page.Navigation.PushModalAsync(hintNavigationPage);
+                await ShowMasterPasswordHintAsync();
             }
             else if (selection == AppResources.RemoveAccount)
             {
@@ -236,6 +272,16 @@ namespace Bit.App.Pages
             }
         }
 
+        public async Task ShowMasterPasswordHintAsync()
+        {
+            var hintNavigationPage = new NavigationPage(new HintPage(Email));
+            if (IsIosExtension)
+            {
+                ThemeManager.ApplyResourcesTo(hintNavigationPage);
+            }
+            await Page.Navigation.PushModalAsync(hintNavigationPage);
+        }
+
         public void TogglePassword()
         {
             ShowPassword = !ShowPassword;
@@ -260,17 +306,5 @@ namespace Bit.App.Pages
                 _logger.Exception(e);
             }
         }
-
-        private async Task PromptToSwitchToExistingAccountAsync(string userId)
-        {
-            var switchToAccount = await _platformUtilsService.ShowDialogAsync(
-                AppResources.SwitchToAlreadyAddedAccountConfirmation,
-                AppResources.AccountAlreadyAdded, AppResources.Yes, AppResources.Cancel);
-            if (switchToAccount)
-            {
-                await _stateService.SetActiveUserAsync(userId);
-                _messagingService.Send("switchedAccount");
-            }
-        }
     }
 }

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

@@ -14,10 +14,7 @@ namespace Bit.App.Pages
 
             _vm.LoginRequest = loginPasswordlessDetails;
 
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                ToolbarItems.Add(_closeItem);
-            }
+            ToolbarItems.Add(_closeItem);
         }
 
         private async void Close_Clicked(object sender, System.EventArgs e)

src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<pages:BaseContentPage
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Bit.App.Pages.LoginPasswordlessRequestPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    x:DataType="pages:LoginPasswordlessRequestViewModel"
+    Title="{Binding PageTitle}">
+
+    <ContentPage.BindingContext>
+        <pages:LoginPasswordlessRequestViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1" x:Name="_closeItem"/>
+    </ContentPage.ToolbarItems>
+
+    <ScrollView>
+        <StackLayout
+            Padding="7, 0, 7, 20">
+            <Label
+                Text="{u:I18n LogInInitiated}"
+                FontSize="Title"
+                FontAttributes="Bold"
+                Margin="0,14,0,21"/>
+            <Label
+                Text="{u:I18n ANotificationHasBeenSentToYourDevice}"
+                FontSize="Small"
+                Margin="0,0,0,10"/>
+            <Label
+                Text="{u:I18n PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice}"
+                FontSize="Small"
+                Margin="0,0,0,24"/>
+            <Label
+                Text="{u:I18n FingerprintPhrase}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <controls:MonoLabel
+                FormattedText="{Binding FingerprintPhrase}"
+                FontSize="Medium"
+                TextColor="{DynamicResource FingerprintPhrase}"/>
+            <Label
+                Text="{u:I18n ResendNotification}"
+                StyleClass="text-md"
+                HorizontalOptions="Start"
+                Margin="0,40,0,0"
+                TextColor="{DynamicResource HyperlinkColor}">
+                <Label.GestureRecognizers>
+                    <TapGestureRecognizer Command="{Binding CreatePasswordlessLoginCommand}" />
+                </Label.GestureRecognizers>
+            </Label>
+            <StackLayout
+                Orientation="Horizontal"
+                Margin="0,30,0,0">
+                <Label
+                    Text="{u:I18n NeedAnotherOption}"
+                    FontSize="Small"
+                    VerticalTextAlignment="End"/>
+                <Label
+                    Text="{u:I18n ViewAllLoginOptions}"
+                    StyleClass="text-md"
+                    VerticalTextAlignment="End"
+                    VerticalOptions="CenterAndExpand"
+                    Margin="5, 0"
+                    TextColor="{DynamicResource HyperlinkColor}">
+                    <Label.GestureRecognizers>
+                        <TapGestureRecognizer Command="{Binding CloseCommand}" />
+                    </Label.GestureRecognizers>
+                </Label>
+            </StackLayout>
+               
+        </StackLayout>
+    </ScrollView>
+</pages:BaseContentPage>

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

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Bit.App.Models;
+using Bit.App.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public partial class LoginPasswordlessRequestPage : BaseContentPage
+    {
+        private LoginPasswordlessRequestViewModel _vm;
+        private readonly AppOptions _appOptions;
+
+        public LoginPasswordlessRequestPage(string email, AppOptions appOptions = null)
+        {
+            InitializeComponent();
+            _appOptions = appOptions;
+            _vm = BindingContext as LoginPasswordlessRequestViewModel;
+            _vm.Page = this;
+            _vm.Email = email;
+            _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
+            _vm.LogInSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await LogInSuccessAsync());
+            _vm.UpdateTempPasswordAction = () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
+            _vm.CloseAction = () => { Navigation.PopModalAsync(); };
+
+            _vm.CreatePasswordlessLoginCommand.Execute(null);
+        }
+
+        protected override void OnAppearing()
+        {
+            base.OnAppearing();
+            _vm.StartCheckLoginRequestStatus();
+        }
+
+        protected override void OnDisappearing()
+        {
+            base.OnDisappearing();
+            _vm.StopCheckLoginRequestStatus();
+        }
+
+        private async Task StartTwoFactorAsync()
+        {
+            var page = new TwoFactorPage(false, _appOptions);
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
+        private async Task LogInSuccessAsync()
+        {
+            if (AppHelpers.SetAlternateMainPage(_appOptions))
+            {
+                return;
+            }
+            var previousPage = await AppHelpers.ClearPreviousPage();
+            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
+        }
+
+        private async Task UpdateTempPasswordAsync()
+        {
+            var page = new UpdateTempPasswordPage();
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+    }
+}
+

src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs

@@ -0,0 +1,194 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.App.Utilities;
+using Bit.Core;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Models.Domain;
+using Bit.Core.Services;
+using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
+using Xamarin.Essentials;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public class LoginPasswordlessRequestViewModel : CaptchaProtectedViewModel
+    {
+        private const int REQUEST_TIME_UPDATE_PERIOD_IN_SECONDS = 4;
+
+        private IDeviceActionService _deviceActionService;
+        private IAuthService _authService;
+        private ISyncService _syncService;
+        private II18nService _i18nService;
+        private IStateService _stateService;
+        private IPlatformUtilsService _platformUtilsService;
+        private IEnvironmentService _environmentService;
+        private ILogger _logger;
+
+        protected override II18nService i18nService => _i18nService;
+        protected override IEnvironmentService environmentService => _environmentService;
+        protected override IDeviceActionService deviceActionService => _deviceActionService;
+        protected override IPlatformUtilsService platformUtilsService => _platformUtilsService;
+
+        private CancellationTokenSource _checkLoginRequestStatusCts;
+        private Task _checkLoginRequestStatusTask;
+        private string _fingerprintPhrase;
+        private string _email;
+        private string _requestId;
+        private string _requestAccessCode;
+        // Item1 publicKey, Item2 privateKey
+        private Tuple<byte[], byte[]> _requestKeyPair;
+
+        public LoginPasswordlessRequestViewModel()
+        {
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
+            _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
+            _authService = ServiceContainer.Resolve<IAuthService>();
+            _syncService = ServiceContainer.Resolve<ISyncService>();
+            _i18nService = ServiceContainer.Resolve<II18nService>();
+            _stateService = ServiceContainer.Resolve<IStateService>();
+            _logger = ServiceContainer.Resolve<ILogger>();
+
+            PageTitle = AppResources.LogInWithAnotherDevice;
+
+            CreatePasswordlessLoginCommand = new AsyncCommand(CreatePasswordlessLoginAsync,
+                onException: ex => HandleException(ex),
+                allowsMultipleExecutions: false);
+
+            CloseCommand = new AsyncCommand(() => Device.InvokeOnMainThreadAsync(CloseAction),
+                onException: _logger.Exception,
+                allowsMultipleExecutions: false);
+        }
+
+        public Action StartTwoFactorAction { get; set; }
+        public Action LogInSuccessAction { get; set; }
+        public Action UpdateTempPasswordAction { get; set; }
+        public Action CloseAction { get; set; }
+
+        public ICommand CreatePasswordlessLoginCommand { get; }
+        public ICommand CloseCommand { get; }
+
+        public string FingerprintPhrase
+        {
+            get => _fingerprintPhrase;
+            set => SetProperty(ref _fingerprintPhrase, value);
+        }
+
+        public string Email
+        {
+            get => _email;
+            set => SetProperty(ref _email, value);
+        }
+
+        public void StartCheckLoginRequestStatus()
+        {
+            try
+            {
+                _checkLoginRequestStatusCts?.Cancel();
+                _checkLoginRequestStatusCts = new CancellationTokenSource();
+                _checkLoginRequestStatusTask = new TimerTask(_logger, CheckLoginRequestStatus, _checkLoginRequestStatusCts).RunPeriodic(TimeSpan.FromSeconds(REQUEST_TIME_UPDATE_PERIOD_IN_SECONDS));
+            }
+            catch (Exception ex)
+            {
+                _logger.Exception(ex);
+            }
+        }
+
+        public void StopCheckLoginRequestStatus()
+        {
+            try
+            {
+                _checkLoginRequestStatusCts?.Cancel();
+                _checkLoginRequestStatusCts?.Dispose();
+                _checkLoginRequestStatusCts = null;
+            }
+            catch (Exception ex)
+            {
+                _logger.Exception(ex);
+            }
+        }
+
+        private async Task CheckLoginRequestStatus()
+        {
+            if (string.IsNullOrEmpty(_requestId) || string.IsNullOrEmpty(_requestAccessCode))
+            {
+                return;
+            }
+
+            try
+            {
+                var response = await _authService.GetPasswordlessLoginResponseAsync(_requestId, _requestAccessCode);
+
+                if (response.RequestApproved == null || !response.RequestApproved.Value)
+                {
+                    return;
+                }
+
+                StopCheckLoginRequestStatus();
+
+                var authResult = await _authService.LogInPasswordlessAsync(Email, _requestAccessCode, _requestId, _requestKeyPair.Item2, response.Key, response.MasterPasswordHash);
+                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+
+                if (await HandleCaptchaAsync(authResult.CaptchaSiteKey, authResult.CaptchaNeeded, CheckLoginRequestStatus))
+                {
+                    return;
+                }
+
+                if (authResult.TwoFactor)
+                {
+                    StartTwoFactorAction?.Invoke();
+                }
+                else if (authResult.ForcePasswordReset)
+                {
+                    UpdateTempPasswordAction?.Invoke();
+                }
+                else
+                {
+                    _syncService.FullSyncAsync(true).FireAndForget();
+                    LogInSuccessAction?.Invoke();
+                }
+            }
+            catch (Exception ex)
+            {
+                StartCheckLoginRequestStatus();
+                HandleException(ex);
+            }
+        }
+
+        private async Task CreatePasswordlessLoginAsync()
+        {
+            await Device.InvokeOnMainThreadAsync(() => _deviceActionService.ShowLoadingAsync(AppResources.Loading));
+
+            var response = await _authService.PasswordlessCreateLoginRequestAsync(_email);
+            if (response != null)
+            {
+                FingerprintPhrase = response.RequestFingerprint;
+                _requestId = response.Id;
+                _requestAccessCode = response.RequestAccessCode;
+                _requestKeyPair = response.RequestKeyPair;
+            }
+
+            await _deviceActionService.HideLoadingAsync();
+        }
+
+        private void HandleException(Exception ex)
+        {
+            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
+            {
+                await _deviceActionService.HideLoadingAsync();
+                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
+            }).FireAndForget();
+            _logger.Exception(ex);
+        }
+    }
+}
+

src/App/Pages/Accounts/LoginPasswordlessViewModel.cs

@@ -100,7 +100,7 @@ namespace Bit.App.Pages
         private async Task UpdateRequestTime()
         {
             TriggerPropertyChanged(nameof(TimeOfRequestText));
-            if (DateTime.UtcNow > LoginRequest?.RequestDate.ToUniversalTime().AddMinutes(Constants.PasswordlessNotificationTimeoutInMinutes))
+            if (LoginRequest?.IsExpired ?? false)
             {
                 StopRequestTimeUpdater();
                 await _platformUtilsService.ShowDialogAsync(AppResources.LoginRequestHasAlreadyExpired);
@@ -110,13 +110,21 @@ namespace Bit.App.Pages
 
         private async Task PasswordlessLoginAsync(bool approveRequest)
         {
-            if (LoginRequest.RequestDate.ToUniversalTime().AddMinutes(Constants.PasswordlessNotificationTimeoutInMinutes) <= DateTime.UtcNow)
+            if (LoginRequest.IsExpired)
             {
                 await _platformUtilsService.ShowDialogAsync(AppResources.LoginRequestHasAlreadyExpired);
                 await Page.Navigation.PopModalAsync();
                 return;
             }
 
+            var loginRequestData = await _authService.GetPasswordlessLoginRequestByIdAsync(LoginRequest.Id);
+            if (loginRequestData.RequestApproved.HasValue && loginRequestData.ResponseDate.HasValue)
+            {
+                await _platformUtilsService.ShowDialogAsync(AppResources.ThisRequestIsNoLongerValid);
+                await Page.Navigation.PopModalAsync();
+                return;
+            }
+
             await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
             await _authService.PasswordlessLoginAsync(LoginRequest.Id, LoginRequest.PubKey, approveRequest);
             await _deviceActionService.HideLoadingAsync();
@@ -140,16 +148,6 @@ namespace Bit.App.Pages
 
             return string.Format(AppResources.XMinutesAgo, DateTime.UtcNow.Minute - requestDate.Value.ToUniversalTime().Minute);
         }
-
-        private void HandleException(Exception ex)
-        {
-            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
-            {
-                await _deviceActionService.HideLoadingAsync();
-                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
-            }).FireAndForget();
-            _logger.Exception(ex);
-        }
     }
 
     public class LoginPasswordlessDetails
@@ -171,5 +169,7 @@ namespace Bit.App.Pages
         public string DeviceType { get; set; }
 
         public string IpAddress { get; set; }
+
+        public bool IsExpired => RequestDate.ToUniversalTime().AddMinutes(Constants.PasswordlessNotificationTimeoutInMinutes) < DateTime.UtcNow;
     }
 }

src/App/Pages/Accounts/SetPasswordPage.xaml

@@ -47,7 +47,7 @@
                            Margin="0, 12, 0, 0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
-                           BorderColor="Accent">
+                           BorderColor="{DynamicResource PrimaryColor}">
                         <Label
                             Text="{u:I18n ResetPasswordAutoEnrollInviteWarning}"
                             StyleClass="text-muted, text-sm, text-bold"
@@ -69,7 +69,7 @@
                            Margin="0, 12, 0, 0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
-                           BorderColor="Accent">
+                           BorderColor="{DynamicResource PrimaryColor}">
                         <Label
                             Text="{Binding PolicySummary}"
                             StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/Accounts/UpdateTempPasswordPage.xaml

@@ -44,7 +44,7 @@
                            Margin="0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
-                           BorderColor="Accent">
+                           BorderColor="{DynamicResource PrimaryColor}">
                         <Label
                             Text="{u:I18n UpdateMasterPasswordWarning}"
                             StyleClass="text-muted, text-sm, text-bold"
@@ -67,7 +67,7 @@
                            Margin="0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
-                           BorderColor="Accent">
+                           BorderColor="{DynamicResource PrimaryColor}">
                         <Label
                             Text="{Binding PolicySummary}"
                             StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/BaseContentPage.cs

@@ -129,7 +129,8 @@ namespace Bit.App.Pages
         {
             if (useCurrentActiveAccount)
             {
-                return new AvatarImageSource(await _stateService.GetNameAsync(), await _stateService.GetEmailAsync());
+                return new AvatarImageSource(await _stateService.GetActiveUserIdAsync(),
+                    await _stateService.GetNameAsync(), await _stateService.GetEmailAsync());
             }
             return new AvatarImageSource();
         }

src/App/Pages/BaseViewModel.cs

@@ -1,4 +1,9 @@
-using Bit.App.Controls;
+using System;
+using Bit.App.Abstractions;
+using Bit.App.Controls;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
@@ -8,6 +13,9 @@ namespace Bit.App.Pages
     {
         private string _pageTitle = string.Empty;
         private AvatarImageSource _avatar;
+        private LazyResolve<IDeviceActionService> _deviceActionService = new LazyResolve<IDeviceActionService>();
+        private LazyResolve<IPlatformUtilsService> _platformUtilsService = new LazyResolve<IPlatformUtilsService>();
+        private LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
 
         public string PageTitle
         {
@@ -22,5 +30,16 @@ namespace Bit.App.Pages
         }
 
         public ContentPage Page { get; set; }
+
+        protected void HandleException(Exception ex, string message = null)
+        {
+            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
+            {
+                await _deviceActionService.Value.HideLoadingAsync();
+                await _platformUtilsService.Value.ShowDialogAsync(message ?? AppResources.GenericErrorMessage);
+            }).FireAndForget();
+            _logger.Value.Exception(ex);
+        }
+
     }
 }

src/App/Pages/CaptchaProtectedViewModel.cs

@@ -16,6 +16,22 @@ namespace Bit.App.Pages
         protected abstract IPlatformUtilsService platformUtilsService { get; }
         protected string _captchaToken = null;
 
+        protected async Task<bool> HandleCaptchaAsync(string captchaSiteKey, bool needsCaptcha, Func<Task> onSuccess)
+        {
+            if (!needsCaptcha)
+            {
+                _captchaToken = null;
+                return false;
+            }
+
+            if (await HandleCaptchaAsync(captchaSiteKey))
+            {
+                await onSuccess();
+                _captchaToken = null;
+            }
+            return true;
+        }
+
         protected async Task<bool> HandleCaptchaAsync(string CaptchaSiteKey)
         {
             var callbackUri = "bitwarden://captcha-callback";

src/App/Pages/Generator/GeneratorPage.xaml

@@ -21,7 +21,7 @@
             <u:InverseBoolConverter x:Key="inverseBool" />
             <u:LocalizableEnumConverter x:Key="localizableEnum" />
             <xct:EnumToBoolConverter x:Key="enumToBool"/>
-            <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
+            <ToolbarItem Text="{u:I18n Cancel}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1"
                          x:Name="_closeItem" x:Key="closeItem" />
             <ToolbarItem Text="{u:I18n Select}"
                      Clicked="Select_Clicked"
@@ -66,7 +66,7 @@
                             Margin="0"
                             HasShadow="False"
                             BackgroundColor="Transparent"
-                            BorderColor="Accent">
+                            BorderColor="{DynamicResource PrimaryColor}">
                         <Label
                             Text="{u:I18n PasswordGeneratorPolicyInEffect}"
                             StyleClass="text-muted, text-sm, text-bold"
@@ -462,7 +462,7 @@
                                 StyleClass="box-value"
                                 HorizontalOptions="End"
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n LowercaseAtoZ}" />
+                                AutomationProperties.Name="{u:I18n LowercaseAtoZ}"/>
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">

src/App/Pages/Generator/GeneratorPage.xaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Styles;
 using Bit.Core.Abstractions;
@@ -18,11 +19,11 @@ namespace Bit.App.Pages
         private readonly Action<string> _selectAction;
         private readonly TabsPage _tabsPage;
 
-        public GeneratorPage(bool fromTabPage, Action<string> selectAction = null, TabsPage tabsPage = null, bool isUsernameGenerator = false, string emailWebsite = null, bool editMode = false)
+        public GeneratorPage(bool fromTabPage, Action<string> selectAction = null, TabsPage tabsPage = null, bool isUsernameGenerator = false, string emailWebsite = null, bool editMode = false, AppOptions appOptions = null)
         {
             _tabsPage = tabsPage;
             InitializeComponent();
-            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
+            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>();
             _vm = BindingContext as GeneratorPageViewModel;
             _vm.Page = this;
             _fromTabPage = fromTabPage;
@@ -31,6 +32,7 @@ namespace Bit.App.Pages
             _vm.IsUsername = isUsernameGenerator;
             _vm.EmailWebsite = emailWebsite;
             _vm.EditMode = editMode;
+            _vm.IosExtension = appOptions?.IosExtension ?? false;
             var isIos = Device.RuntimePlatform == Device.iOS;
             if (selectAction != null)
             {
@@ -134,14 +136,6 @@ namespace Bit.App.Pages
             await _vm.SliderChangedAsync();
         }
 
-        private async void Close_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                await Navigation.PopModalAsync();
-            }
-        }
-
         public override async Task UpdateOnThemeChanged()
         {
             await base.UpdateOnThemeChanged();

src/App/Pages/Generator/GeneratorPageViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core;
@@ -21,6 +22,7 @@ namespace Bit.App.Pages
         private readonly IClipboardService _clipboardService;
         private readonly IUsernameGenerationService _usernameGenerationService;
         private readonly ITokenService _tokenService;
+        private readonly IDeviceActionService _deviceActionService;
         readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
         private PasswordGenerationOptions _options;
@@ -59,6 +61,7 @@ namespace Bit.App.Pages
             _clipboardService = ServiceContainer.Resolve<IClipboardService>();
             _usernameGenerationService = ServiceContainer.Resolve<IUsernameGenerationService>();
             _tokenService = ServiceContainer.Resolve<ITokenService>();
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
 
             PageTitle = AppResources.Generator;
             GeneratorTypeOptions = new List<GeneratorType> {
@@ -89,8 +92,9 @@ namespace Bit.App.Pages
             UsernameTypePromptHelpCommand = new Command(UsernameTypePromptHelp);
             RegenerateCommand = new AsyncCommand(RegenerateAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
             RegenerateUsernameCommand = new AsyncCommand(RegenerateUsernameAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-            ToggleForwardedEmailHiddenValueCommand = new AsyncCommand(ToggleForwardedEmailHiddenValueAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-            CopyCommand = new AsyncCommand(CopyAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
+            ToggleForwardedEmailHiddenValueCommand = new AsyncCommand(ToggleForwardedEmailHiddenValueAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
+            CopyCommand = new AsyncCommand(CopyAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
+            CloseCommand = new AsyncCommand(CloseAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
         }
 
         public List<GeneratorType> GeneratorTypeOptions { get; set; }
@@ -104,6 +108,7 @@ namespace Bit.App.Pages
         public ICommand RegenerateUsernameCommand { get; set; }
         public ICommand ToggleForwardedEmailHiddenValueCommand { get; set; }
         public ICommand CopyCommand { get; set; }
+        public ICommand CloseCommand { get; set; }
 
         public string Password
         {
@@ -140,6 +145,8 @@ namespace Bit.App.Pages
             set => SetProperty(ref _isUsername, value);
         }
 
+        public bool IosExtension { get; set; }
+
         public bool ShowTypePicker
         {
             get => _showTypePicker;
@@ -606,6 +613,7 @@ namespace Bit.App.Pages
             LoadFromOptions();
 
             _usernameOptions = await _usernameGenerationService.GetOptionsAsync();
+            await _tokenService.PrepareTokenForDecodingAsync();
             _usernameOptions.PlusAddressedEmail = _tokenService.GetEmail();
             _usernameOptions.EmailWebsite = EmailWebsite;
             _usernameOptions.CatchAllEmailType = _usernameOptions.PlusAddressedEmailType = string.IsNullOrWhiteSpace(EmailWebsite) || !EditMode ? UsernameEmailType.Random : UsernameEmailType.Website;
@@ -681,6 +689,7 @@ namespace Bit.App.Pages
                 return;
             }
 
+            _usernameOptions.EmailWebsite = EmailWebsite;
             await _usernameGenerationService.SaveOptionsAsync(_usernameOptions);
 
             if (regenerate && UsernameTypeSelected != UsernameType.ForwardedEmailAlias)
@@ -729,6 +738,18 @@ namespace Bit.App.Pages
             }
         }
 
+        public async Task CloseAsync()
+        {
+            if (IosExtension)
+            {
+                _deviceActionService.CloseExtensionPopUp();
+            }
+            else
+            {
+                await Page.Navigation.PopModalAsync();
+            }
+        }
+
         private void LoadFromOptions()
         {
             AllowAmbiguousChars = _options.AllowAmbiguousChar.GetValueOrDefault();
@@ -765,6 +786,7 @@ namespace Bit.App.Pages
             TriggerPropertyChanged(nameof(PlusAddressedEmail));
             TriggerPropertyChanged(nameof(GeneratorTypeSelected));
             TriggerPropertyChanged(nameof(UsernameTypeDescriptionLabel));
+            TriggerPropertyChanged(nameof(EmailWebsite));
         }
 
         private void SetOptions()

src/App/Pages/Send/SendAddEditPage.xaml

@@ -67,7 +67,7 @@
                             Margin="0, 12, 0, 0"
                             HasShadow="False"
                             BackgroundColor="Transparent"
-                            BorderColor="Accent">
+                            BorderColor="{DynamicResource PrimaryColor}">
                             <Label
                                 Text="{u:I18n SendDisabledWarning}"
                                 StyleClass="text-muted, text-sm, text-bold"
@@ -79,7 +79,7 @@
                             Margin="0, 12, 0, 0"
                             HasShadow="False"
                             BackgroundColor="Transparent"
-                            BorderColor="Accent">
+                            BorderColor="{DynamicResource PrimaryColor}">
                             <Label
                                 Text="{u:I18n SendOptionsPolicyInEffect}"
                                 StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/Send/SendAddOnlyPage.xaml

@@ -48,7 +48,7 @@
                     Margin="0, 12, 0, 0"
                     HasShadow="False"
                     BackgroundColor="Transparent"
-                    BorderColor="Accent">
+                    BorderColor="{DynamicResource PrimaryColor}">
                     <Label
                         Text="{u:I18n SendDisabledWarning}"
                         StyleClass="text-muted, text-sm, text-bold"
@@ -60,7 +60,7 @@
                     Margin="0, 12, 0, 0"
                     HasShadow="False"
                     BackgroundColor="Transparent"
-                    BorderColor="Accent">
+                    BorderColor="{DynamicResource PrimaryColor}">
                     <Label
                         Text="{u:I18n SendOptionsPolicyInEffect}"
                         StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml

@@ -108,7 +108,7 @@
                         Margin="0, 12, 0, 6"
                         HasShadow="False"
                         BackgroundColor="Transparent"
-                        BorderColor="Accent">
+                        BorderColor="{DynamicResource PrimaryColor}">
                         <Label
                             Text="{u:I18n SendDisabledWarning}"
                             StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/Settings/ExportVaultPage.xaml

@@ -34,7 +34,7 @@
                 Margin="0, 12, 0, 0"
                 HasShadow="False"
                 BackgroundColor="Transparent"
-                BorderColor="Accent">
+                BorderColor="{DynamicResource PrimaryColor}">
                 <Label
                     Text="{u:I18n DisablePersonalVaultExportPolicyInEffect}"
                     StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/Settings/SettingsPage/SettingsPage.xaml

@@ -26,7 +26,7 @@
                         Padding="10"
                         HasShadow="False"
                         BackgroundColor="Transparent"
-                        BorderColor="Accent">
+                        BorderColor="{DynamicResource PrimaryColor}">
                         <Label
                             Text="{Binding Name, Mode=OneWay}"
                             StyleClass="text-muted, text-sm, text-bold"
@@ -57,7 +57,7 @@
                         Padding="10"
                         HasShadow="False"
                         BackgroundColor="Transparent"
-                        BorderColor="Accent">
+                        BorderColor="{DynamicResource PrimaryColor}">
                         <Label
                             Text="{Binding Name, Mode=OneWay}"
                             StyleClass="text-muted, text-sm, text-bold"

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.View;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
@@ -32,6 +35,7 @@ namespace Bit.App.Pages
         private readonly IClipboardService _clipboardService;
         private readonly ILogger _loggerService;
         private readonly IPushNotificationService _pushNotificationService;
+        private readonly IWatchDeviceService _watchDeviceService;
         private const int CustomVaultTimeoutValue = -100;
 
         private bool _supportsBiometric;
@@ -44,6 +48,7 @@ namespace Bit.App.Pages
         private bool _showChangeMasterPassword;
         private bool _reportLoggingEnabled;
         private bool _approvePasswordlessLoginRequests;
+        private bool _shouldConnectToWatch;
 
         private List<KeyValuePair<string, int?>> _vaultTimeouts =
             new List<KeyValuePair<string, int?>>
@@ -87,6 +92,7 @@ namespace Bit.App.Pages
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
             _loggerService = ServiceContainer.Resolve<ILogger>("logger");
             _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();
+            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
 
             GroupedItems = new ObservableRangeCollection<ISettingsPageListItem>();
             PageTitle = AppResources.Settings;
@@ -138,6 +144,9 @@ namespace Bit.App.Pages
                 !await _keyConnectorService.GetUsesKeyConnector();
             _reportLoggingEnabled = await _loggerService.IsEnabled();
             _approvePasswordlessLoginRequests = await _stateService.GetApprovePasswordlessLoginsAsync();
+
+            _shouldConnectToWatch = await _stateService.GetShouldConnectToWatchAsync();
+
             BuildList();
         }
 
@@ -601,19 +610,26 @@ namespace Bit.App.Pages
                     ExecuteAsync = () => SetScreenCaptureAllowedAsync()
                 });
             }
-            var accountItems = new List<SettingsPageListItem>
+            var accountItems = new List<SettingsPageListItem>();
+            if (Device.RuntimePlatform == Device.iOS)
             {
-                new SettingsPageListItem
+                accountItems.Add(new SettingsPageListItem
                 {
-                    Name = AppResources.FingerprintPhrase,
-                    ExecuteAsync = () => FingerprintAsync()
-                },
-                new SettingsPageListItem
-                {
-                    Name = AppResources.LogOut,
-                    ExecuteAsync = () => LogOutAsync()
-                }
-            };
+                    Name = AppResources.ConnectToWatch,
+                    SubLabel = _shouldConnectToWatch ? AppResources.On : AppResources.Off,
+                    ExecuteAsync = () => ToggleWatchConnectionAsync()
+                });
+            }
+            accountItems.Add(new SettingsPageListItem
+            {
+                Name = AppResources.FingerprintPhrase,
+                ExecuteAsync = () => FingerprintAsync()
+            });
+            accountItems.Add(new SettingsPageListItem
+            {
+                Name = AppResources.LogOut,
+                ExecuteAsync = () => LogOutAsync()
+            });
             if (_showChangeMasterPassword)
             {
                 accountItems.Insert(0, new SettingsPageListItem
@@ -791,5 +807,13 @@ namespace Bit.App.Pages
                 await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok);
             }
         }
+
+        private async Task ToggleWatchConnectionAsync()
+        {
+            _shouldConnectToWatch = !_shouldConnectToWatch;
+
+            await _watchDeviceService.SetShouldConnectToWatchAsync(_shouldConnectToWatch);
+            BuildList();
+        }
     }
 }

src/App/Pages/Settings/SyncPageViewModel.cs

@@ -90,6 +90,7 @@ namespace Bit.App.Pages
             try
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.Syncing);
+                await _syncService.SyncPasswordlessLoginRequestsAsync();
                 var success = await _syncService.FullSyncAsync(true);
                 await _deviceActionService.HideLoadingAsync();
                 if (success)

src/App/Pages/Vault/CipherAddEditPage.xaml

@@ -96,7 +96,7 @@
                            Margin="0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
-                           BorderColor="Accent">
+                           BorderColor="{DynamicResource PrimaryColor}">
                         <Label
                             Text="{u:I18n PersonalOwnershipPolicyInEffect}"
                             StyleClass="text-muted, text-sm, text-bold"

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

@@ -263,12 +263,6 @@ namespace Bit.App.Pages
         {
             if (DoOnce())
             {
-                var cameraPermission = await PermissionManager.CheckAndRequestPermissionAsync(new Permissions.Camera());
-                if (cameraPermission != PermissionStatus.Granted)
-                {
-                    return;
-                }
-
                 var page = new ScanPage(key =>
                 {
                     Device.BeginInvokeOnMainThread(async () =>
@@ -277,6 +271,7 @@ namespace Bit.App.Pages
                         await _vm.UpdateTotpKeyAsync(key);
                     });
                 });
+
                 await Navigation.PushModalAsync(new Xamarin.Forms.NavigationPage(page));
             }
         }

src/App/Pages/Vault/CipherAddEditPageViewModel.cs

@@ -29,6 +29,7 @@ namespace Bit.App.Pages
         private readonly ICustomFieldItemFactory _customFieldItemFactory;
         private readonly IClipboardService _clipboardService;
         private readonly IAutofillHandler _autofillHandler;
+        private readonly IWatchDeviceService _watchDeviceService;
 
         private bool _showNotesSeparator;
         private bool _showPassword;
@@ -80,6 +81,7 @@ namespace Bit.App.Pages
             _customFieldItemFactory = ServiceContainer.Resolve<ICustomFieldItemFactory>("customFieldItemFactory");
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
             _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
+            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
 
             GeneratePasswordCommand = new Command(GeneratePassword);
             TogglePasswordCommand = new Command(TogglePassword);
@@ -507,6 +509,8 @@ namespace Bit.App.Pages
                     EditMode && !CloneMode ? AppResources.ItemUpdated : AppResources.NewItemCreated);
                 _messagingService.Send(EditMode && !CloneMode ? "editedCipher" : "addedCipher", Cipher.Id);
 
+                _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
+
                 if (Page is CipherAddEditPage page && page.FromAutofillFramework)
                 {
                     // Close and go back to app

src/App/Pages/Vault/CipherDetailsPageViewModel.cs

@@ -31,6 +31,7 @@ namespace Bit.App.Pages
         private readonly ILocalizeService _localizeService;
         private readonly ICustomFieldItemFactory _customFieldItemFactory;
         private readonly IClipboardService _clipboardService;
+        private readonly IWatchDeviceService _watchDeviceService;
 
         private List<ICustomFieldItemViewModel> _fields;
         private bool _canAccessPremium;
@@ -62,6 +63,7 @@ namespace Bit.App.Pages
             _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
             _customFieldItemFactory = ServiceContainer.Resolve<ICustomFieldItemFactory>("customFieldItemFactory");
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
+            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
 
             CopyCommand = new AsyncCommand<string>((id) => CopyAsync(id, null), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
             CopyUriCommand = new AsyncCommand<LoginUriView>(uriView => CopyAsync("LoginUri", uriView.Uri), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
@@ -371,6 +373,9 @@ namespace Bit.App.Pages
                     await _cipherService.SoftDeleteWithServerAsync(Cipher.Id);
                 }
                 await _deviceActionService.HideLoadingAsync();
+
+                _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
+
                 _platformUtilsService.ShowToast("success", null,
                     Cipher.IsDeleted ? AppResources.ItemDeleted : AppResources.ItemSoftDeleted);
                 _messagingService.Send(Cipher.IsDeleted ? "deletedCipher" : "softDeletedCipher", Cipher);

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

@@ -189,6 +189,7 @@ namespace Bit.App.Pages
             if (await _stateService.GetSyncOnRefreshAsync() && Refreshing && !SyncRefreshing)
             {
                 SyncRefreshing = true;
+                await _syncService.SyncPasswordlessLoginRequestsAsync();
                 await _syncService.FullSyncAsync(false);
                 return;
             }

src/App/Pages/Vault/ScanPage.xaml

@@ -34,16 +34,13 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <zxing:ZXingScannerView
-            x:Name="_zxing"
-            HorizontalOptions="FillAndExpand"
-            VerticalOptions="FillAndExpand"
+        <ContentView 
+            x:Name="_scannerContainer"
             AutomationId="zxingScannerView"
             IsVisible="{Binding ShowScanner}"
             Grid.Column="0"
             Grid.Row="0"
-            Grid.RowSpan="3"
-            OnScanResult="OnScanResult"/>
+            Grid.RowSpan="3"/>
         <StackLayout
             VerticalOptions="Center"
             HorizontalOptions="FillAndExpand"

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

@@ -8,8 +8,10 @@ using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using SkiaSharp;
 using SkiaSharp.Views.Forms;
+using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Essentials;
 using Xamarin.Forms;
+using ZXing.Net.Mobile.Forms;
 
 namespace Bit.App.Pages
 {
@@ -26,20 +28,15 @@ namespace Bit.App.Pages
         private bool _pageIsActive;
         private bool _qrcodeFound;
         private float _scale;
-
+        private ZXingScannerView _zxing;
         private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
         public ScanPage(Action<string> callback)
         {
-            _callback = callback;
             InitializeComponent();
-            _zxing.Options = new ZXing.Mobile.MobileBarcodeScanningOptions
-            {
-                UseNativeScanning = true,
-                PossibleFormats = new List<ZXing.BarcodeFormat> { ZXing.BarcodeFormat.QR_CODE },
-                AutoRotate = false,
-                TryInverted = true
-            };
+            _callback = callback;
+            ViewModel.InitScannerCommand = new Command(() => InitScanner());
+
             if (Device.RuntimePlatform == Device.Android)
             {
                 ToolbarItems.RemoveAt(0);
@@ -55,6 +52,53 @@ namespace Bit.App.Pages
         protected override void OnAppearing()
         {
             base.OnAppearing();
+            StartScanner();
+        }
+
+        protected override void OnDisappearing()
+        {
+            StopScanner().FireAndForget();
+            base.OnDisappearing();
+        }
+
+        // Fix known bug with DelayBetweenAnalyzingFrames & DelayBetweenContinuousScans: https://github.com/Redth/ZXing.Net.Mobile/issues/721
+        private void InitScanner()
+        {
+            try
+            {
+                if (!ViewModel.HasCameraPermission || !ViewModel.ShowScanner || _zxing != null)
+                {
+                    return;
+                }
+
+                _zxing = new ZXingScannerView();
+                _zxing.Options = new ZXing.Mobile.MobileBarcodeScanningOptions
+                {
+                    UseNativeScanning = true,
+                    PossibleFormats = new List<ZXing.BarcodeFormat> { ZXing.BarcodeFormat.QR_CODE },
+                    AutoRotate = false,
+                    TryInverted = true,
+                    DelayBetweenAnalyzingFrames = 5,
+                    DelayBetweenContinuousScans = 5
+                };
+                _scannerContainer.Content = _zxing;
+                StartScanner();
+            }
+            catch (Exception ex)
+            {
+                _logger.Value.Exception(ex);
+            }
+        }
+
+        private void StartScanner()
+        {
+            if (_zxing == null)
+            {
+                return;
+            }
+
+            _zxing.OnScanResult -= OnScanResult;
+            _zxing.OnScanResult += OnScanResult;
             _zxing.IsScanning = true;
 
             // Fix for Autofocus, now it's done every 2 seconds so that the user does't have to do it
@@ -98,16 +142,21 @@ namespace Bit.App.Pages
             AnimationLoopAsync();
         }
 
-        protected override async void OnDisappearing()
+        private async Task StopScanner()
         {
+            if (_zxing == null)
+            {
+                return;
+            }
+
             _autofocusCts?.Cancel();
             if (_continuousAutofocusTask != null)
             {
                 await _continuousAutofocusTask;
             }
             _zxing.IsScanning = false;
+            _zxing.OnScanResult -= OnScanResult;
             _pageIsActive = false;
-            base.OnDisappearing();
         }
 
         private async void OnScanResult(ZXing.Result result)

src/App/Pages/Vault/ScanPageViewModel.cs

@@ -1,6 +1,14 @@
-using Bit.App.Resources;
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
+using Bit.Core.Services;
+using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
+using Xamarin.Essentials;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -9,13 +17,46 @@ namespace Bit.App.Pages
     {
         private bool _showScanner = true;
         private string _totpAuthenticationKey;
+        private IPlatformUtilsService _platformUtilsService;
+        private IDeviceActionService _deviceActionService;
+        private ILogger _logger;
 
         public ScanPageViewModel()
         {
-            ToggleScanModeCommand = new Command(() => ShowScanner = !ShowScanner);
+            ToggleScanModeCommand = new AsyncCommand(ToggleScanMode, onException: HandleException);
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _logger = ServiceContainer.Resolve<ILogger>();
+            InitAsync().FireAndForget();
         }
 
-        public Command ToggleScanModeCommand { get; set; }
+        public async Task InitAsync()
+        {
+            try
+            {
+                await Device.InvokeOnMainThreadAsync(async () =>
+                {
+                    var hasCameraPermission = await PermissionManager.CheckAndRequestPermissionAsync(new Permissions.Camera());
+                    HasCameraPermission = hasCameraPermission == PermissionStatus.Granted;
+                    ShowScanner = hasCameraPermission == PermissionStatus.Granted;
+                });
+
+                if (!HasCameraPermission)
+                {
+                    return;
+                }
+                InitScannerCommand.Execute(null);
+            }
+            catch (System.Exception ex)
+            {
+                HandleException(ex);
+            }
+        }
+
+        public ICommand ToggleScanModeCommand { get; set; }
+        public ICommand InitScannerCommand { get; set; }
+
+        public bool HasCameraPermission { get; set; }
         public string ScanQrPageTitle => ShowScanner ? AppResources.ScanQrTitle : AppResources.AuthenticatorKeyScanner;
         public string CameraInstructionTop => ShowScanner ? AppResources.PointYourCameraAtTheQRCode : AppResources.OnceTheKeyIsSuccessfullyEntered;
         public string TotpAuthenticationKey
@@ -39,6 +80,23 @@ namespace Bit.App.Pages
                 });
         }
 
+        private async Task ToggleScanMode()
+        {
+            var cameraPermission = await PermissionManager.CheckAndRequestPermissionAsync(new Permissions.Camera());
+            HasCameraPermission = cameraPermission == PermissionStatus.Granted;
+            if (!HasCameraPermission)
+            {
+                var openAppSettingsResult = await _platformUtilsService.ShowDialogAsync(AppResources.EnableCamerPermissionToUseTheScanner, title: string.Empty, confirmText: AppResources.Settings, cancelText: AppResources.NoThanks);
+                if (openAppSettingsResult)
+                {
+                    _deviceActionService.OpenAppSettings();
+                }
+                return;
+            }
+            ShowScanner = !ShowScanner;
+            InitScannerCommand.Execute(null);
+        }
+
         public FormattedString ToggleScanModeLabel
         {
             get
@@ -57,5 +115,15 @@ namespace Bit.App.Pages
                 return fs;
             }
         }
+
+        private void HandleException(Exception ex)
+        {
+            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
+            {
+                await _deviceActionService.HideLoadingAsync();
+                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
+            }).FireAndForget();
+            _logger.Exception(ex);
+        }
     }
 }

src/App/Resources/AppResources.Designer.cs

@@ -481,6 +481,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to A notification has been sent to your device..
+        /// </summary>
+        public static string ANotificationHasBeenSentToYourDevice {
+            get {
+                return ResourceManager.GetString("ANotificationHasBeenSentToYourDevice", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to API access token.
         /// </summary>
@@ -1489,6 +1498,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Connect to Watch.
+        /// </summary>
+        public static string ConnectToWatch {
+            get {
+                return ResourceManager.GetString("ConnectToWatch", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Continue.
         /// </summary>
@@ -2119,6 +2137,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Enable camera permission to use the scanner.
+        /// </summary>
+        public static string EnableCamerPermissionToUseTheScanner {
+            get {
+                return ResourceManager.GetString("EnableCamerPermissionToUseTheScanner", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Enabled.
         /// </summary>
@@ -2893,6 +2920,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Get master password hint.
+        /// </summary>
+        public static string GetMasterPasswordwordHint {
+            get {
+                return ResourceManager.GetString("GetMasterPasswordwordHint", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Get your master password hint.
         /// </summary>
@@ -3406,6 +3442,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Logging in as {0}.
+        /// </summary>
+        public static string LoggingInAsX {
+            get {
+                return ResourceManager.GetString("LoggingInAsX", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Log In.
         /// </summary>
@@ -3434,10 +3479,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Login attempt from {0}. Do you want to switch to this account?.
+        ///   Looks up a localized string similar to Login attempt from:
+        ///{0}
+        ///Do you want to switch to this account?.
         /// </summary>
-        public static string LoginAttemptFromXDoYouWantToSwitchToThisAccount
-        {
+        public static string LoginAttemptFromXDoYouWantToSwitchToThisAccount {
             get {
                 return ResourceManager.GetString("LoginAttemptFromXDoYouWantToSwitchToThisAccount", resourceCulture);
             }
@@ -3461,6 +3507,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Log in initiated.
+        /// </summary>
+        public static string LogInInitiated {
+            get {
+                return ResourceManager.GetString("LogInInitiated", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Login.
         /// </summary>
@@ -3507,7 +3562,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Enterprise Single Sign-On.
+        ///   Looks up a localized string similar to Enterprise single sign-on.
         /// </summary>
         public static string LogInSso {
             get {
@@ -3542,6 +3597,24 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Log In with another device.
+        /// </summary>
+        public static string LogInWithAnotherDevice {
+            get {
+                return ResourceManager.GetString("LogInWithAnotherDevice", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Log in with master password.
+        /// </summary>
+        public static string LogInWithMasterPassword {
+            get {
+                return ResourceManager.GetString("LogInWithMasterPassword", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Log out.
         /// </summary>
@@ -3929,6 +4002,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Need another option?.
+        /// </summary>
+        public static string NeedAnotherOption {
+            get {
+                return ResourceManager.GetString("NeedAnotherOption", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Never.
         /// </summary>
@@ -3947,6 +4029,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to New around here?.
+        /// </summary>
+        public static string NewAroundHere {
+            get {
+                return ResourceManager.GetString("NewAroundHere", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to New custom field.
         /// </summary>
@@ -4181,6 +4272,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Not you?.
+        /// </summary>
+        public static string NotYou {
+            get {
+                return ResourceManager.GetString("NotYou", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to This login does not have a username or password configured..
         /// </summary>
@@ -4650,6 +4750,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Please make sure your vault is unlocked and the Fingerprint phrase matches on the other device..
+        /// </summary>
+        public static string PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice {
+            get {
+                return ResourceManager.GetString("PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Plus addressed email.
         /// </summary>
@@ -4948,6 +5057,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Resend notification.
+        /// </summary>
+        public static string ResendNotification {
+            get {
+                return ResourceManager.GetString("ResendNotification", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password..
         /// </summary>
@@ -5137,15 +5255,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to .
-        /// </summary>
-        public static string SelectAddTotpToStoreTheKeySafely {
-            get {
-                return ResourceManager.GetString("SelectAddTotpToStoreTheKeySafely", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to You must select at least one collection..
         /// </summary>
@@ -5776,6 +5885,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to This request is no longer valid.
+        /// </summary>
+        public static string ThisRequestIsNoLongerValid {
+            get {
+                return ResourceManager.GetString("ThisRequestIsNoLongerValid", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 3 days.
         /// </summary>
@@ -6487,6 +6605,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to View all log in options.
+        /// </summary>
+        public static string ViewAllLoginOptions {
+            get {
+                return ResourceManager.GetString("ViewAllLoginOptions", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to View item.
         /// </summary>

src/App/Resources/AppResources.af.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} is gekopieer.</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Bevestig vingerafdruk</value>
@@ -2299,9 +2299,6 @@ Skandering gebeur outomaties.</value>
     <value>Sodra u die sleutel reg ingevoer het,
 kies u Voeg TOTP toe om die sleutel veilig te bewaar</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Deur u vergrendelopsies na “Nooit” te stel, is u kluis beskikbaar aan enigeen met toegang tot u toestel. Indien u hierdie opsie gebruik moet u seker maak dat u u toestel voldoende beskerm.</value>
   </data>
@@ -2452,6 +2449,9 @@ kies u Voeg TOTP toe om die sleutel veilig te bewaar</value>
   <data name="Random" xml:space="preserve">
     <value>Lukraak</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Connect to Watch</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Toeganklikheidsdiensopenbaarmaking</value>
   </data>
@@ -2472,4 +2472,46 @@ kies u Voeg TOTP toe om die sleutel veilig te bewaar</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>New around here?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Get master password hint</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Not you?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Log in with master password</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Log In with another device</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Log in initiated</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>A notification has been sent to your device.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <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>Resend notification</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Need another option?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>View all log in options</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>This request is no longer valid</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Enable camera permission to use the scanner</value>
+  </data>
 </root>

src/App/Resources/AppResources.ar.resx

@@ -118,17 +118,17 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="About" xml:space="preserve">
-    <value>حول</value>
+    <value>عن التطبيق</value>
   </data>
   <data name="Add" xml:space="preserve">
-    <value>إضافة</value>
+    <value>أضِف</value>
     <comment>Add/create a new entity (verb).</comment>
   </data>
   <data name="AddFolder" xml:space="preserve">
-    <value>إضافة مجلد</value>
+    <value>مجلد مضاف</value>
   </data>
   <data name="AddItem" xml:space="preserve">
-    <value>إضافة عنصر</value>
+    <value>تمت إضافة العنصر</value>
     <comment>The title for the add item page.</comment>
   </data>
   <data name="AnErrorHasOccurred" xml:space="preserve">
@@ -323,14 +323,14 @@
     <comment>Label for a password.</comment>
   </data>
   <data name="Save" xml:space="preserve">
-    <value>تسجيل</value>
+    <value>حفظ</value>
     <comment>Button text for a save operation (verb).</comment>
   </data>
   <data name="Move" xml:space="preserve">
     <value>نقل</value>
   </data>
   <data name="Saving" xml:space="preserve">
-    <value>تسجيل ...</value>
+    <value>حفظ...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="Settings" xml:space="preserve">
@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} تم نسخه</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>التحقق من بصمة الإصبع</value>
@@ -2300,9 +2300,6 @@
     <value>بمجرد إدخال المفتاح بنجاح،
 حدد إضافة TOTP لتخزين المفتاح بأمان</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>تعيين خيارات قفل الخاص بك إلى "مطلقا" يبقي خزنتك متاحةً لأي شخص لديه حق الوصول إلى جهازك. إذا كنت تستخدم هذا الخيار، يجب أن تتأكد من الحفاظ على حماية جهازك بشكل صحيح.</value>
   </data>
@@ -2319,64 +2316,64 @@
     <value>هل أنت متأكد من أنك تريد تمكين التقاط الشاشة؟</value>
   </data>
   <data name="LogInRequested" xml:space="preserve">
-    <value>Login requested</value>
+    <value>طلب تسجيل الدخول</value>
   </data>
   <data name="AreYouTryingToLogIn" xml:space="preserve">
-    <value>Are you trying to log in?</value>
+    <value>هل تحاول تسجيل الدخول؟</value>
   </data>
   <data name="LogInAttemptByXOnY" xml:space="preserve">
-    <value>Login attempt by {0} on {1}</value>
+    <value>محاولة تسجيل الدخول بواسطة {0} في {1}</value>
   </data>
   <data name="DeviceType" xml:space="preserve">
-    <value>Device type</value>
+    <value>نوع الجهاز</value>
   </data>
   <data name="IpAddress" xml:space="preserve">
-    <value>IP address</value>
+    <value>عنوان IP</value>
   </data>
   <data name="Time" xml:space="preserve">
-    <value>Time</value>
+    <value>الوقت</value>
   </data>
   <data name="Near" xml:space="preserve">
-    <value>Near</value>
+    <value>قريب</value>
   </data>
   <data name="ConfirmLogIn" xml:space="preserve">
-    <value>Confirm login</value>
+    <value>تأكيد تسجيل الدخول</value>
   </data>
   <data name="DenyLogIn" xml:space="preserve">
-    <value>Deny login</value>
+    <value>رفض تسجيل الدخول</value>
   </data>
   <data name="JustNow" xml:space="preserve">
-    <value>Just now</value>
+    <value>للتو</value>
   </data>
   <data name="XMinutesAgo" xml:space="preserve">
-    <value>{0} minutes ago</value>
+    <value>منذ {0} دقائق</value>
   </data>
   <data name="LogInAccepted" xml:space="preserve">
-    <value>Login confirmed</value>
+    <value>تم تأكيد تسجيل الدخول</value>
   </data>
   <data name="LogInDenied" xml:space="preserve">
-    <value>Login denied</value>
+    <value>تم رفض تسجيل الدخول</value>
   </data>
   <data name="ApproveLoginRequests" xml:space="preserve">
-    <value>Approve login requests</value>
+    <value>الموافقة على طلبات تسجيل الدخول</value>
   </data>
   <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>Use this device to approve login requests made from other devices.</value>
+    <value>استخدم هذا الجهاز للموافقة على طلبات تسجيل الدخول من الأجهزة الأخرى.</value>
   </data>
   <data name="AllowNotifications" xml:space="preserve">
-    <value>Allow notifications</value>
+    <value>السماح بالإشعارات</value>
   </data>
   <data name="ReceivePushNotificationsForNewLoginRequests" xml:space="preserve">
-    <value>Receive push notifications for new login requests</value>
+    <value>تلقي إشعارات دفع لطلبات تسجيل الدخول الجديدة</value>
   </data>
   <data name="NoThanks" xml:space="preserve">
-    <value>No thanks</value>
+    <value>ﻻ، شكرًا</value>
   </data>
   <data name="ConfimLogInAttempForX" xml:space="preserve">
-    <value>Confirm login attempt for {0}</value>
+    <value>تأكيد محاولة تسجيل الدخول لـ {0}</value>
   </data>
   <data name="AllNotifications" xml:space="preserve">
-    <value>All notifications</value>
+    <value>جميع الإشعارات</value>
   </data>
   <data name="PasswordType" xml:space="preserve">
     <value>نوع كلمة المرور</value>
@@ -2453,24 +2450,69 @@
   <data name="Random" xml:space="preserve">
     <value>عشوائي</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>متّصل بالسّاعة</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
-    <value>Accessibility Service Disclosure</value>
+    <value>كشف خدمة إمكانية الوصول</value>
   </data>
   <data name="AccessibilityDisclosureText" xml:space="preserve">
-    <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>
+    <value>Bitwarden يستخدم خدمة إمكانية الوصول للبحث عن حقول تسجيل الدخول في التطبيقات ومواقع الويب، ثم يقوم بإنشاء معرفات الحقل المناسب لإدخال اسم المستخدم وكلمة المرور عند العثور على تطابق للتطبيق أو الموقع. ونحن لا نخزن أيا من المعلومات التي قدمتها لنا الخدمة، كما أننا لا نحاول السيطرة على أي عناصر على الشاشة تتجاوز إدخال نصوص وثائق التفويض.</value>
   </data>
   <data name="Accept" xml:space="preserve">
-    <value>Accept</value>
+    <value>قبول</value>
   </data>
   <data name="Decline" xml:space="preserve">
-    <value>Decline</value>
+    <value>رفض</value>
   </data>
   <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
-    <value>Login request has already expired.</value>
+    <value>انتهت صلاحية طلب تسجيل الدخول.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>Login attempt from:
+    <value>محاولة تسجيل الدخول من:
 {0}
-Do you want to switch to this account?</value>
+هل تريد التبديل إلى هذا الحساب؟</value>
+  </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>جديد هنا؟</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>احصل على تلميح كلمة المرور الرئيسية</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>تسجيل الدخول كـ {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>ليس أنت؟</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>تسجيل الدخول باستخدام كلمة المرور الرئيسية</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>تسجيل الدخول باستخدام جهاز آخر</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>بدء تسجيل الدخول</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>تم إرسال إشعار إلى جهازك.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <value>الرجاء التأكد من أن الخزنة الخاصة بك غير مقفلة وأن عبارة بصمة الإصبع تتطابق على الجهاز الآخر.</value>
+  </data>
+  <data name="ResendNotification" xml:space="preserve">
+    <value>إعادة إرسال الإشعار</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>هل تحتاج إلى خيار آخر؟</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>عرض جميع خيارات تسجيل الدخول</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>هذا الطلب لم يعد صالحًا</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>تمكين إذن الكاميرا لاستخدام الماسح الضوئي</value>
   </data>
 </root>

src/App/Resources/AppResources.az.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} kopyalandı.</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Barmaq izini təsdiqlə</value>
@@ -2298,9 +2298,6 @@ Skan prosesi avtomatik baş tutacaq.</value>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Açar uğurla daxil edildikdən sonra, açarı güvənli şəkildə saxlamaq üçün "TOTP əlavə et"i seçin</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Kilid seçimlərini "Heç vaxt" olaraq tənzimləmək, anbarınızı cihazınıza müraciəti olan hər kəsə əlçatan edir. Bu seçimi istifadə etsəniz, cihazınızı düzgün qoruduğunuza əmin olmalısınız.</value>
   </data>
@@ -2451,6 +2448,9 @@ Skan prosesi avtomatik baş tutacaq.</value>
   <data name="Random" xml:space="preserve">
     <value>Təsadüfi</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>"Watch"a bağlan</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Əlçatımlılıq Xidməti açıqlaması</value>
   </data>
@@ -2471,4 +2471,46 @@ Skan prosesi avtomatik baş tutacaq.</value>
 {0}
 Bu hesaba keçmək istəyirsiniz?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>Burada yenisiniz?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Ana parol üçün məsləhət alın</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} olaraq giriş edilir</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Siz deyilsiniz?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Ana parolla giriş et</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Başqa cihazla giriş et</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Giriş etmə başladıldı</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>Cihazınıza bir bildiriş göndərildi.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <value>Zəhmət olmasa anbarınızın kilidinin açıq olduğuna və Barmaq izi ifadəsinin digər cihazda uyğun gəldiyinə əmin olun.</value>
+  </data>
+  <data name="ResendNotification" xml:space="preserve">
+    <value>Bildirişi təkrar göndər</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Başqa bir seçimə ehtiyacınız var?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>Bütün giriş etmə seçimlərinə bax</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>Bu tələb artıq yararsızdır</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Skaneri istifadə etmək üçün kamera icazəsini fəallaşdırın</value>
+  </data>
 </root>

src/App/Resources/AppResources.be.resx

@@ -273,13 +273,13 @@
     <comment>The log out button text (verb).</comment>
   </data>
   <data name="LogoutConfirmation" xml:space="preserve">
-    <value>Вы ўпэўнены, што хочаце выйсці?</value>
+    <value>Вы сапраўды хочаце выйсці?</value>
   </data>
   <data name="RemoveAccount" xml:space="preserve">
     <value>Выдаліць уліковы запіс</value>
   </data>
   <data name="RemoveAccountConfirmation" xml:space="preserve">
-    <value>Вы ўпэўнены, што хочаце выдаліць уліковы запіс?</value>
+    <value>Вы сапраўды хочаце выдаліць уліковы запіс?</value>
   </data>
   <data name="AccountAlreadyAdded" xml:space="preserve">
     <value>Уліковы запіс ужо дададзены</value>
@@ -349,7 +349,7 @@
     <value>Адправіць</value>
   </data>
   <data name="Sync" xml:space="preserve">
-    <value>Сінхранізавана</value>
+    <value>Сінхранізаваць</value>
     <comment>The title for the sync page.</comment>
   </data>
   <data name="ThankYou" xml:space="preserve">
@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} скапіяваны</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Праверка адбітка пальца</value>
@@ -559,7 +559,7 @@
     <value>Дзеянне пасля заканчэння часу чакання сховішча</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Выхад з сістэмы скасуе ўсе магчымасці доступу да сховішча і запатрабуе аўтэнтыфікацыю праз інтэрнэт пасля завяршэння часу чакання. Вы ўпэўнены, што хочаце выкарыстоўваць гэты параметр?</value>
+    <value>Выхад з сістэмы скасуе ўсе магчымасці доступу да сховішча і запатрабуе аўтэнтыфікацыю праз інтэрнэт пасля завяршэння часу чакання. Вы сапраўды хочаце выкарыстоўваць гэты параметр?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Уваход...</value>
@@ -644,7 +644,7 @@
     <value>Мы адправілі вам на электронную пошту падказку да асноўнага пароля.</value>
   </data>
   <data name="PasswordOverrideAlert" xml:space="preserve">
-    <value>Вы ўпэўнены, што хочаце перазапісаць бягучы пароль?</value>
+    <value>Вы сапраўды хочаце перазапісаць бягучы пароль?</value>
   </data>
   <data name="PushNotificationAlert" xml:space="preserve">
     <value>Bitwarden дазваляе аўтаматычна сінхранізаваць сховішча пры дапамозе push-апавяшчэнняў. Для максімальнай зручнасці, выберыце "Дазволіць" пры з'яўленні прапановы ўключыць push-апавяшчэнні.</value>
@@ -793,7 +793,7 @@
     <value>Вы сапраўды хочаце аўтазапоўніць або паглядзець гэты элемент?</value>
   </data>
   <data name="BitwardenAutofillServiceMatchConfirm" xml:space="preserve">
-    <value>Вы ўпэўнены, што хочаце выкарыстоўваць для аўтазапаўнення гэты элемент? Ён не дакладна адпавядае "{0}".</value>
+    <value>Вы сапраўды хочаце выкарыстоўваць для аўтазапаўнення гэты элемент? Ён не дакладна адпавядае "{0}".</value>
   </data>
   <data name="MatchingItems" xml:space="preserve">
     <value>Адпаведныя элементы</value>
@@ -883,7 +883,7 @@
     <comment>Message shown when downloading a file</comment>
   </data>
   <data name="AttachmentLargeWarning" xml:space="preserve">
-    <value>Гэта далучэнне мае памер {0}. Вы ўпэўнены, што хочаце спампаваць яго на сваю прыладу?</value>
+    <value>Гэта далучэнне мае памер {0}. Вы сапраўды хочаце спампаваць яго на сваю прыладу?</value>
     <comment>The placeholder will show the file size of the attachment. Ex "25 MB"</comment>
   </data>
   <data name="AuthenticatorKey" xml:space="preserve">
@@ -1561,7 +1561,7 @@
     <value>Выхад</value>
   </data>
   <data name="ExitConfirmation" xml:space="preserve">
-    <value>Вы ўпэўнены, што хочаце выйсці з Bitwarden?</value>
+    <value>Вы сапраўды хочаце выйсці з Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
     <value>Вы сапраўды хочаце, каб пасля перазапуску праграма патрабавала асноўны пароль для разблакіроўкі?</value>
@@ -1622,7 +1622,7 @@
     <value>Біяметрычныя праверка</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
-    <value>Біяметрыяй</value>
+    <value>біяметрыяй</value>
   </data>
   <data name="UseBiometricsToUnlock" xml:space="preserve">
     <value>Выкарыстоўваць біяметрычныя даныя для разблакіроўкі</value>
@@ -1963,7 +1963,7 @@
     <value>Выдаліць пароль</value>
   </data>
   <data name="AreYouSureRemoveSendPassword" xml:space="preserve">
-    <value>Вы ўпэўнены, што хочаце выдаліць пароль?</value>
+    <value>Вы сапраўды хочаце выдаліць пароль?</value>
   </data>
   <data name="RemovingSendPassword" xml:space="preserve">
     <value>Выдаленне пароля</value>
@@ -2010,7 +2010,7 @@
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AreYouSureDeleteSend" xml:space="preserve">
-    <value>Вы ўпэўнены, што хочаце выдаліць гэты Send?</value>
+    <value>Вы сапраўды хочаце выдаліць гэты Send?</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendDeleted" xml:space="preserve">
@@ -2176,7 +2176,7 @@
     <value>Выдаленне вашага ўліковага запісу з'яўляецца незваротным дзеяннем</value>
   </data>
   <data name="DeleteAccountExplanation" xml:space="preserve">
-    <value>Ваш уліковы запіс і ўсе даныя сховішча будуць выдалены без магчымасці аднаўлення. Вы ўпэўнены, што хочаце працягнуць?</value>
+    <value>Ваш уліковы запіс і ўсе даныя сховішча будуць выдалены без магчымасці аднаўлення. Вы сапраўды хочаце працягнуць?</value>
   </data>
   <data name="DeletingYourAccount" xml:space="preserve">
     <value>Выдаленне вашага ўліковага запісу</value>
@@ -2299,9 +2299,6 @@
     <value>Пасля таго, як ваш ключ паспяхова ўведзены,
 выберыце "Дадаць TOTP" для надзейнага захавання ключа</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Прызначыўшы параметр блакіравання "Ніколі", ваша сховішча будзе даступна кожнаму, хто мае доступ да вашай прылады. Калі вы выкарыстоўваеце гэты параметр, вы павінны быць упэўнены ў тым, што ваша прылада надзейна абаронена.</value>
   </data>
@@ -2315,7 +2312,7 @@
     <value>Дазволіць здымкі экрана</value>
   </data>
   <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
-    <value>Вы ўпэўнены, што хочаце дазволіць здымкі экрана?</value>
+    <value>Вы сапраўды хочаце дазволіць здымкі экрана?</value>
   </data>
   <data name="LogInRequested" xml:space="preserve">
     <value>Выкананы запыт уваходу</value>
@@ -2426,7 +2423,7 @@
     <value>Токен доступу да API</value>
   </data>
   <data name="AreYouSureYouWantToOverwriteTheCurrentUsername" xml:space="preserve">
-    <value>Вы ўпэўнены, што хочаце перазапісаць бягучае імя карыстальніка?</value>
+    <value>Вы сапраўды хочаце перазапісаць бягучае імя карыстальніка?</value>
   </data>
   <data name="GenerateUsername" xml:space="preserve">
     <value>Генерыраваць імя карыстальніка</value>
@@ -2452,6 +2449,9 @@
   <data name="Random" xml:space="preserve">
     <value>Выпадкова</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Падлучыцца да гадзінніка</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Апісанне службы спецыяльных магчымасцей</value>
   </data>
@@ -2472,4 +2472,46 @@
 {0}
 Вы сапраўды хочаце перайсці на гэты ўліковы запіс?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>Упершыню тут?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Атрымаць падказку да асноўнага пароля</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Увайсці як {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Не вы?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Увайсці з асноўным паролем</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Увайсці з іншай прылады</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Ініцыяваны ўваход</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>Апавяшчэнне было адпраўлена на вашу прыладу.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <value>Пераканайцеся, што ваша сховішча разблакіравана, а фраза адбітка пальца супадае з іншай прыладай.</value>
+  </data>
+  <data name="ResendNotification" xml:space="preserve">
+    <value>Адправіць апавяшчэнне паўторна</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Неабходны іншы варыянт?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>Паглядзець усе варыянты ўваходу</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>Гэты запыт больш не дзейнічае</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Каб выкарыстоўваць сканер дайце дазвол на выкарыстанне камеры</value>
+  </data>
 </root>

src/App/Resources/AppResources.bg.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} беше копирано.</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Потвърждаване на пръстовия отпечатък</value>
@@ -2300,9 +2300,6 @@
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Ако изберете „Никога“ като настройка за заключването, трезорът Ви ще бъде достъпен за всеки, който има досег с устройството. Ако използвате тази настройка, трябва да се уверите, че устройството Ви е удачно защитено.</value>
   </data>
@@ -2453,6 +2450,9 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Произволно</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Свързване към часовник</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Използване на услугата за достъпност</value>
   </data>
@@ -2473,4 +2473,46 @@ select Add TOTP to store the key safely</value>
 {0}
 Искате ли да превключите към тази регистрация?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>За пръв път ли сте тук?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Получете подсказване за главната парола</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Вписване като {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Това не сте Вие?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Вписване с главната парола</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Вписване с друго устройство</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Вписването е стартирано</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>Към устройството Ви е изпратено известие.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <value>Уверете се, че трезорът Ви е отключен и че Уникалната фраза съвпада с другото устройство.</value>
+  </data>
+  <data name="ResendNotification" xml:space="preserve">
+    <value>Повторно изпращане на известието</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Предпочитате друг вариант?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>Вижте всички възможности за вписване</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>Тази зявка вече не е приложима</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Разрешете достъпа до камерата, за да използвате скенера</value>
+  </data>
 </root>

src/App/Resources/AppResources.bn.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} copied</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verify fingerprint</value>
@@ -1762,7 +1762,7 @@ Scanning will happen automatically.</value>
     <value>Syncing vault with pull down gesture.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Enterprise Single Sign-On</value>
+    <value>Enterprise single sign-on</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Quickly log in using your organization's single sign-on portal. Please enter your organization's identifier to begin.</value>
@@ -2300,9 +2300,6 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <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>
@@ -2453,6 +2450,9 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Connect to Watch</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2473,4 +2473,46 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>New around here?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Get master password hint</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Not you?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Log in with master password</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Log In with another device</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Log in initiated</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>A notification has been sent to your device.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <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>Resend notification</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Need another option?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>View all log in options</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>This request is no longer valid</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Enable camera permission to use the scanner</value>
+  </data>
 </root>

src/App/Resources/AppResources.bs.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} kopirano.</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Potvrdi otisak prsta</value>
@@ -2299,9 +2299,6 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <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>
@@ -2452,6 +2449,9 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Connect to Watch</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2472,4 +2472,46 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>New around here?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Get master password hint</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Not you?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Log in with master password</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Log In with another device</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Log in initiated</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>A notification has been sent to your device.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <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>Resend notification</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Need another option?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>View all log in options</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>This request is no longer valid</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Enable camera permission to use the scanner</value>
+  </data>
 </root>

src/App/Resources/AppResources.ca.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>S'ha copiat '{0}'.</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verifica empremta digital</value>
@@ -769,16 +769,16 @@
     <value>2. Activeu el commutador i premeu d'acord per acceptar.</value>
   </data>
   <data name="Disabled" xml:space="preserve">
-    <value>Deshabilitat</value>
+    <value>No</value>
   </data>
   <data name="Enabled" xml:space="preserve">
-    <value>Habilitat</value>
+    <value>Sí</value>
   </data>
   <data name="Off" xml:space="preserve">
-    <value>Desactivat</value>
+    <value>No</value>
   </data>
   <data name="On" xml:space="preserve">
-    <value>Activat</value>
+    <value>Sí</value>
   </data>
   <data name="Status" xml:space="preserve">
     <value>Estat</value>
@@ -1620,13 +1620,13 @@ L'escaneig es farà automàticament.</value>
     <value>La vostra sessió ha caducat.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Utilitzeu dades biomètriques per verificar</value>
+    <value>Desbloqueja amb biometria</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Dades biomètriques</value>
   </data>
   <data name="UseBiometricsToUnlock" xml:space="preserve">
-    <value>Utilitzeu dades biomètriques per desbloquejar</value>
+    <value>Desbloqueja amb biometria</value>
   </data>
   <data name="AccessibilityOverlayPermissionAlert" xml:space="preserve">
     <value>Bitwarden necessita atenció: vegeu "Servei d'accessibilitat d'emplenament automàtic" de la configuració de Bitwarden</value>
@@ -1828,7 +1828,7 @@ L'escaneig es farà automàticament.</value>
     <value>Serveis d'emplenament automàtic</value>
   </data>
   <data name="InlineAutofill" xml:space="preserve">
-    <value>Utilitza l'emplenament automàtic en línia</value>
+    <value>Utilitza l'emplenament automàtic integrat</value>
   </data>
   <data name="InlineAutofillDescription" xml:space="preserve">
     <value>Utilitzeu l'emplenament automàtic en línia si l'IME (teclat) seleccionat l'admet. Si la vostra configuració no és compatible (o aquesta opció està desactivada), s'utilitzarà la superposició d'emplenament automàtic per defecte.</value>
@@ -2299,9 +2299,6 @@ L'escaneig es farà automàticament.</value>
     <value>Una vegada introduïda la clau correctament,
 seleccioneu Afegeix TOTP per emmagatzemar la clau de manera segura</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Si configureu les opcions de bloqueig a "Mai", la vostra caixa forta està disponible per a qualsevol persona amb accés al vostre dispositiu. Si utilitzeu aquesta opció, hauríeu d'assegurar-vos de mantenir el vostre dispositiu correctament protegit.</value>
   </data>
@@ -2452,6 +2449,9 @@ seleccioneu Afegeix TOTP per emmagatzemar la clau de manera segura</value>
   <data name="Random" xml:space="preserve">
     <value>Aleatori</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Connect to Watch</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Divulgació del servei d'accessibilitat</value>
   </data>
@@ -2472,4 +2472,46 @@ seleccioneu Afegeix TOTP per emmagatzemar la clau de manera segura</value>
 {0}
 Voleu canviar a aquest compte?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>Nou per ací?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Obteniu la pista de la contrasenya mestra</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Connectat com {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>No sou vosaltres?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Inicia sessió amb la contrasenya mestra</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Inicia sessió amb un altre dispositiu</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>S'ha iniciat la sessió</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>S'ha enviat una notificació al vostre dispositiu.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <value>Assegureu-vos que la vostra caixa forta estiga desbloquejada i que la frase d'empremta digital coincidisca amb l'altre dispositiu.</value>
+  </data>
+  <data name="ResendNotification" xml:space="preserve">
+    <value>Torna a enviar la notificació</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Necessiteu una altra opció?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>Veure totes les opcions d'inici de sessió</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>Aquesta sol·licitud ja no és vàlida</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Habilita el permís de la càmera per utilitzar l'escàner</value>
+  </data>
 </root>

src/App/Resources/AppResources.cs.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} bylo zkopírováno.</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Ověření otisku prstu</value>
@@ -919,7 +919,7 @@ Načtení proběhne automaticky.</value>
     <value>Zkopírujte si TOTP ověřovací kód do schránky, pokud používáte autentizační klíč k přihlašování, před použitím automatického vyplňování.</value>
   </data>
   <data name="CopyTotpAutomatically" xml:space="preserve">
-    <value>Copy TOTP automatically</value>
+    <value>Automaticky kopírovat TOTP</value>
   </data>
   <data name="PremiumRequired" xml:space="preserve">
     <value>Pro použití této funkce je potřebné prémiové členství.</value>
@@ -1457,11 +1457,11 @@ Načtení proběhne automaticky.</value>
     <value>Nejsou k dispozici žádné složky k zobrazení.</value>
   </data>
   <data name="FingerprintPhrase" xml:space="preserve">
-    <value>Fráze otisku prstu</value>
+    <value>Fráze otisku účtu</value>
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
   <data name="YourAccountsFingerprint" xml:space="preserve">
-    <value>Fráze otisku prstu vašeho účtu</value>
+    <value>Fráze otisku vašeho účtu</value>
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
   <data name="LearnOrgConfirmation" xml:space="preserve">
@@ -1976,7 +1976,7 @@ Načtení proběhne automaticky.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="DisableSend" xml:space="preserve">
-    <value>Zakažte tento Send, aby k němu nikdo neměl přístup.</value>
+    <value>Vypnout tento Send, aby k němu nikdo neměl přístup</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NoSends" xml:space="preserve">
@@ -2044,7 +2044,7 @@ Načtení proběhne automaticky.</value>
     <value>Vlastní</value>
   </data>
   <data name="ShareOnSave" xml:space="preserve">
-    <value>Sdílet tento Send po uložení.</value>
+    <value>Sdílet tento Send po uložení</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendDisabledWarning" xml:space="preserve">
@@ -2056,7 +2056,7 @@ Načtení proběhne automaticky.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="HideEmail" xml:space="preserve">
-    <value>Skrýt mou e-mailovou adresu před příjemci.</value>
+    <value>Skrýt mou e-mailovou adresu před příjemci</value>
   </data>
   <data name="SendOptionsPolicyInEffect" xml:space="preserve">
     <value>Jedna nebo více zásad organizace ovlivňuje nastavení Send.</value>
@@ -2092,7 +2092,7 @@ Načtení proběhne automaticky.</value>
     <value>Aktualizovat hlavní heslo</value>
   </data>
   <data name="UpdateMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password was recently changed by an administrator in your organization. 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>
+    <value>Administrátor v organizaci nedávno změnil vaše hlavní heslo. Pro přístup k trezoru jej nyní musíte změnit. Pokračování vás odhlásí z vaší aktuální relace a bude nutné se znovu přihlásit. Aktivní relace na jiných zařízeních mohou zůstat aktivní až po dobu jedné hodiny.</value>
   </data>
   <data name="UpdatingPassword" xml:space="preserve">
     <value>Aktualizace hesla</value>
@@ -2218,10 +2218,10 @@ Načtení proběhne automaticky.</value>
     <value>Zadejte ověřovací kód, který byl odeslán na %@</value>
   </data>
   <data name="SubmitCrashLogs" xml:space="preserve">
-    <value>Odeslat protokoly o pádech</value>
+    <value>Odesílat záznamy o pádech</value>
   </data>
   <data name="SubmitCrashLogsDescription" xml:space="preserve">
-    <value>Help Bitwarden improve app stability by submitting crash reports.</value>
+    <value>Pomozte zlepšovat stabilitu aplikace odesíláním hlášení o selháních.</value>
   </data>
   <data name="OptionsExpanded" xml:space="preserve">
     <value>Options are expanded, tap to collapse.</value>
@@ -2251,19 +2251,19 @@ Načtení proběhne automaticky.</value>
     <value>Heslo není viditelné, klepněte pro zobrazení.</value>
   </data>
   <data name="FilterByVault" xml:space="preserve">
-    <value>Filter items by vault</value>
+    <value>Filtrovat položky podle trezoru</value>
   </data>
   <data name="AllVaults" xml:space="preserve">
-    <value>All vaults</value>
+    <value>Všechny trezory</value>
   </data>
   <data name="Vaults" xml:space="preserve">
-    <value>Vaults</value>
+    <value>Trezory</value>
   </data>
   <data name="VaultFilterDescription" xml:space="preserve">
-    <value>Vault: {0}</value>
+    <value>Trezor: {0}</value>
   </data>
   <data name="All" xml:space="preserve">
-    <value>All</value>
+    <value>Všechny</value>
   </data>
   <data name="Totp" xml:space="preserve">
     <value>TOTP</value>
@@ -2290,20 +2290,17 @@ Načtení proběhne automaticky.</value>
     <value>Enter key manually</value>
   </data>
   <data name="AddTotp" xml:space="preserve">
-    <value>Add TOTP</value>
+    <value>Přidat TOTP</value>
   </data>
   <data name="SetupTotp" xml:space="preserve">
-    <value>Set up TOTP</value>
+    <value>Nastavit TOTP</value>
   </data>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
-    <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>
+    <value>Nastavení zámku na „Nikdy“ ponechá váš trezor k dispozici komukoliv s přístupem k vašemu zařízení. Používáte-li tuto možnost, měli byste zajistit, aby vaše zařízení bylo náležitě chráněno.</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>
@@ -2387,13 +2384,13 @@ select Add TOTP to store the key safely</value>
     <value>Typ uživatelského jména</value>
   </data>
   <data name="PlusAddressedEmail" xml:space="preserve">
-    <value>Plus addressed email</value>
+    <value>E-mailová adresa s plusem</value>
   </data>
   <data name="CatchAllEmail" xml:space="preserve">
     <value>Catch-all email</value>
   </data>
   <data name="ForwardedEmailAlias" xml:space="preserve">
-    <value>Forwarded email alias</value>
+    <value>Alias přeposílaného e-mailu</value>
   </data>
   <data name="RandomWord" xml:space="preserve">
     <value>Náhodné slovo</value>
@@ -2447,11 +2444,14 @@ select Add TOTP to store the key safely</value>
     <value>Use your domain's configured catch-all inbox.</value>
   </data>
   <data name="ForwardedEmailDescription" xml:space="preserve">
-    <value>Generate an email alias with an external forwarding service.</value>
+    <value>Vygeneruje alias e-mailu pomocí externí přeposílací služby.</value>
   </data>
   <data name="Random" xml:space="preserve">
     <value>Náhodně</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Connect to Watch</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2468,8 +2468,50 @@ select Add TOTP to store the key safely</value>
     <value>Požadavek na přihlášení již vypršel.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>Login attempt from:
+    <value>Pokus o přihlášení z:
 {0}
-Do you want to switch to this account?</value>
+Chcete se přepnout na tento účet?</value>
+  </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>Jste tu noví?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Získat nápovědu pro hlavní heslo</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Přihlášování jako {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Nejste to vy?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Přihlásit se pomocí hlavního hesla</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Přihlásit se pomocí jiného zařízení</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Přihlášení zahájeno</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>Na vaše zařízení bylo odesláno oznámení.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <value>Ujistěte se, že je váš trezor odemčen a fráze otisku prstu se shodují s druhým zařízením.</value>
+  </data>
+  <data name="ResendNotification" xml:space="preserve">
+    <value>Odeslat oznámení znovu</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Potřebujete jinou možnost?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>Zobrazit všechny možnosti přihlášení</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>Tento požadavek již není platný</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Enable camera permission to use the scanner</value>
   </data>
 </root>

src/App/Resources/AppResources.da.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} kopieret</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verificér fingeraftryk</value>
@@ -1762,7 +1762,7 @@ Skanning vil ske automatisk.</value>
     <value>Synkronisering af boks med træk nedad-gestus.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Virksomheds Single Sign On</value>
+    <value>Virksomheds Single Sign-On</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Log hurtigt ind vha. din organisations single sign-on portal. Angiv din organisations identifikator for at begynde.</value>
@@ -2299,9 +2299,6 @@ Skanning vil ske automatisk.</value>
     <value>Når nøglen er angivet,
 vælg Tilføj TOTP for at gemme nøglen sikkert</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Sættes låseindstillingen til “Aldrig”, er din boks tilgængelig for alle med adgang til enheden. Bruges denne mulighed, så vær sikker på, at din enhed er ordentligt beskyttet.</value>
   </data>
@@ -2452,6 +2449,9 @@ vælg Tilføj TOTP for at gemme nøglen sikkert</value>
   <data name="Random" xml:space="preserve">
     <value>Tilfældig</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Opret forbindelse til Watch</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Oplysninger om tilgængelighedstjeneste</value>
   </data>
@@ -2472,4 +2472,46 @@ vælg Tilføj TOTP for at gemme nøglen sikkert</value>
 {0}
 Vil du skifte til denne konto?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>Ny her?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Få hovedadgangskodetip</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logger ind som {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Ikke dig?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Log ind med hovedadgangskoden</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Log ind med en anden enhed</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Indlogning påbegyndt</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>En notifikation er sendt til din enhed.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <value>Sørg for, at din boks er oplåst, samt at Fingeraftrykssætningen på den anden enhed matcher.</value>
+  </data>
+  <data name="ResendNotification" xml:space="preserve">
+    <value>Gensend notifikation</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Behov for en anden mulighed?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>Vis alle indlogningsmuligheder</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>Anmodningen er ikke længere gyldig</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Tildel kameratilladelse for brug af skanneren</value>
+  </data>
 </root>

src/App/Resources/AppResources.de.resx

@@ -229,7 +229,7 @@
     <value>Ordner</value>
   </data>
   <data name="FolderUpdated" xml:space="preserve">
-    <value>Ordner wurde aktualisiert</value>
+    <value>Ordner aktualisiert</value>
   </data>
   <data name="GoToWebsite" xml:space="preserve">
     <value>Webseite besuchen</value>
@@ -342,7 +342,7 @@
     <comment>Reveal a hidden value (password).</comment>
   </data>
   <data name="ItemDeleted" xml:space="preserve">
-    <value>Eintrag wurde gelöscht</value>
+    <value>Eintrag gelöscht</value>
     <comment>Confirmation message after successfully deleting a login.</comment>
   </data>
   <data name="Submit" xml:space="preserve">
@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} wurde kopiert</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Fingerabdruck überprüfen</value>
@@ -416,7 +416,7 @@
     <value>Neuer Eintrag</value>
   </data>
   <data name="AppExtension" xml:space="preserve">
-    <value>App Erweiterung</value>
+    <value>App-Erweiterung</value>
   </data>
   <data name="AutofillAccessibilityDescription" xml:space="preserve">
     <value>Verwende den Bitwarden Dienst in den Bedienungshilfen, um deine Zugangsdaten in Apps und im Web automatisch ausfüllen zu lassen.</value>
@@ -428,7 +428,7 @@
     <value>Mehrdeutige Zeichen vermeiden</value>
   </data>
   <data name="BitwardenAppExtension" xml:space="preserve">
-    <value>Bitwarden App Erweiterung</value>
+    <value>Bitwarden App-Erweiterung</value>
   </data>
   <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
     <value>Die einfachste Möglichkeit, neue Anmeldedaten zu Ihrem Tresor hinzuzufügen, ist die Bitwarden App Erweiterung. Erfahren Sie mehr über die Bitwarden App Erweiterung, indem Sie zu dem "Einstellungen"-Bildschirm navigieren.</value>
@@ -477,13 +477,13 @@
     <value>Gebe die E-Mail Adresse deines Kontos ein, um den Hinweis für dein Master-Passwort zu erhalten.</value>
   </data>
   <data name="ExntesionReenable" xml:space="preserve">
-    <value>App Erweiterung wieder aktivieren</value>
+    <value>App-Erweiterung wieder aktivieren</value>
   </data>
   <data name="ExtensionAlmostDone" xml:space="preserve">
     <value>Fast geschafft!</value>
   </data>
   <data name="ExtensionEnable" xml:space="preserve">
-    <value>App Erweiterung aktivieren</value>
+    <value>App-Erweiterung aktivieren</value>
   </data>
   <data name="ExtensionInSafari" xml:space="preserve">
     <value>In Safari findest du Bitwarden unter dem Teilen-Symbol (Hinweis: scrolle auf der untersten Zeile des Menüs nach rechts).</value>
@@ -647,7 +647,7 @@
     <value>Bist du sicher, dass du das aktuelle Passwort überschreiben möchtest?</value>
   </data>
   <data name="PushNotificationAlert" xml:space="preserve">
-    <value>Bitwarden aktualisiert deinen Tresor mit Pushbenachrichtigungen. Für die bestmögliche Benutzererfahrung tippe im folgenden Dialogfenster auf "Ok", um Pushbenachrichtigungen zu aktivieren.</value>
+    <value>Bitwarden aktualisiert deinen Tresor mit Push-Benachrichtigungen. Für die bestmögliche Benutzererfahrung tippe im folgenden Dialogfenster auf "Ok", um Push-Benachrichtigungen zu aktivieren.</value>
     <comment>Push notifications for apple products</comment>
   </data>
   <data name="RateTheApp" xml:space="preserve">
@@ -705,10 +705,10 @@
     <comment>What Apple calls their fingerprint reader.</comment>
   </data>
   <data name="TwoStepLogin" xml:space="preserve">
-    <value>Zwei-Faktor Authentifizierung</value>
+    <value>Zwei-Faktor-Authentifizierung</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>Mit der Zwei-Faktor Authentifizierung wird dein Account zusätzlich abgesichert, da jede Anmeldung durch einen Sicherheitscode, eine Authentifizierungs-App, SMS, einen Anruf oder eine E-Mail verifiziert werden muss. Die Zwei-Faktor Authentifizierung kann im Bitwarden.com Web-Tresor aktiviert werden. Möchtest du die Seite jetzt öffnen?</value>
+    <value>Mit der Zwei-Faktor-Authentifizierung wird dein Account zusätzlich abgesichert, da jede Anmeldung durch einen Sicherheitscode, eine Authentifizierungs-App, SMS, einen Anruf oder eine E-Mail verifiziert werden muss. Die Zwei-Faktor-Authentifizierung kann im Web-Tresor unter bitwarden.com aktiviert werden. Möchtest du die Seite jetzt öffnen?</value>
   </data>
   <data name="UnlockWith" xml:space="preserve">
     <value>Mit {0} entsperren</value>
@@ -831,7 +831,7 @@
     <comment>For 2FA whenever there are no available providers on this device.</comment>
   </data>
   <data name="NoTwoStepAvailable" xml:space="preserve">
-    <value>Dieses Konto hat eine aktive Zwei-Faktor Authentifizierung, allerdings wird keiner der konfigurierten Zwei-Faktor Anbieter von diesem Gerät unterstützt. Bitte nutzen Sie ein unterstütztes Gerät und / oder fügen Sie zusätzliche Anbieter hinzu, die von mehr Geräten unterstützt werden (wie eine Authentifizierungs-App).</value>
+    <value>Dieses Konto hat eine aktive Zwei-Faktor-Authentifizierung, allerdings wird keiner der konfigurierten Zwei-Faktor-Anbieter von diesem Gerät unterstützt. Bitte nutzen Sie ein unterstütztes Gerät und / oder fügen Sie zusätzliche Anbieter hinzu, die von mehr Geräten unterstützt werden (wie eine Authentifizierungs-App).</value>
   </data>
   <data name="RecoveryCodeTitle" xml:space="preserve">
     <value>Wiederherstellungscode</value>
@@ -1726,7 +1726,7 @@ Das Scannen erfolgt automatisch.</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Eintrag wurde wiederhergestellt</value>
+    <value>Eintrag wiederhergestellt</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
@@ -2298,9 +2298,6 @@ Das Scannen erfolgt automatisch.</value>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Sobald der Schlüssel erfolgreich eingegeben wurde, wähle TOTP hinzufügen, um den Schlüssel sicher abzuspeichern</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Wenn du deine Sperroptionen auf „Nie“ einstellst, bleibt dein Tresor für jeden zugänglich, der Zugriff auf dein Gerät hat. Wenn du diese Option verwendest, solltest du sicherstellen, dass du dein Gerät angemessen schützt.</value>
   </data>
@@ -2451,6 +2448,9 @@ Das Scannen erfolgt automatisch.</value>
   <data name="Random" xml:space="preserve">
     <value>Zufällig</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Mit Uhr verbinden</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Bedienungshilfen Offenlegung</value>
   </data>
@@ -2471,4 +2471,46 @@ Das Scannen erfolgt automatisch.</value>
 {0}
 Möchtest du zu diesem Konto wechseln?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>Neu hier?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Hinweis zum Master-Passwort erhalten</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Anmelden als {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Nicht du?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Mit Master-Passwort anmelden</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Mit einem anderen Gerät anmelden</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Anmeldung initiiert</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>Eine Benachrichtigung wurde an dein Gerät gesendet.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <value>Bitte stelle sicher, dass dein Tresor entsperrt ist und die Fingerabdruck-Phrase mit dem anderen Gerät übereinstimmt.</value>
+  </data>
+  <data name="ResendNotification" xml:space="preserve">
+    <value>Benachrichtigung erneut senden</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Brauchst du eine andere Option?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>Alle Anmelde-Optionen anzeigen</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>Diese Anfrage ist nicht mehr gültig</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Kamerazugriff aktivieren, um den Scanner zu verwenden</value>
+  </data>
 </root>

src/App/Resources/AppResources.el.resx

@@ -377,7 +377,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} έχει αντιγραφεί.</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Επαλήθευση Δακτυλικού Αποτυπώματος</value>
@@ -2299,9 +2299,6 @@
     <value>Μόλις το κλειδί εισαχθεί με επιτυχία,
 επιλέξτε Προσθήκη TOTP για να αποθηκεύσετε το κλειδί με ασφάλεια</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Ρυθμίζοντας τις επιλογές κλειδώματος σε “Ποτέ” κρατά τη κρύπτη σας διαθέσιμη σε οποιονδήποτε με πρόσβαση στη συσκευή σας. Εάν χρησιμοποιείτε αυτήν την επιλογή, θα πρέπει να διασφαλίσετε ότι διατηρείτε τη συσκευή σας σωστά προστατευμένη.</value>
   </data>
@@ -2452,6 +2449,9 @@
   <data name="Random" xml:space="preserve">
     <value>Τυχαίο</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Connect to Watch</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Γνωστοποίηση Υπηρεσίας Προσβασιμότητας</value>
   </data>
@@ -2472,4 +2472,46 @@
 {0}
 Do you want to switch to this account?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>New around here?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Get master password hint</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Not you?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Log in with master password</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Log In with another device</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Log in initiated</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>A notification has been sent to your device.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <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>Resend notification</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Need another option?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>View all log in options</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>This request is no longer valid</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Enable camera permission to use the scanner</value>
+  </data>
 </root>

src/App/Resources/AppResources.en-GB.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} copied</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verify fingerprint</value>
@@ -471,19 +471,19 @@
     <value>Edit item</value>
   </data>
   <data name="EnableAutomaticSyncing" xml:space="preserve">
-    <value>Enable automatic syncing</value>
+    <value>Allow automatic syncing</value>
   </data>
   <data name="EnterEmailForHint" xml:space="preserve">
     <value>Enter your account email address to receive your master password hint.</value>
   </data>
   <data name="ExntesionReenable" xml:space="preserve">
-    <value>Re-enable app extension</value>
+    <value>Reactivate app extension</value>
   </data>
   <data name="ExtensionAlmostDone" xml:space="preserve">
     <value>Almost done!</value>
   </data>
   <data name="ExtensionEnable" xml:space="preserve">
-    <value>Enable app extension</value>
+    <value>Activate app extension</value>
   </data>
   <data name="ExtensionInSafari" xml:space="preserve">
     <value>In Safari, find Bitwarden using the share icon (hint: scroll to the right on the bottom row of the menu).</value>
@@ -604,7 +604,7 @@
     <value>Never</value>
   </data>
   <data name="NewItemCreated" xml:space="preserve">
-    <value>New item created.</value>
+    <value>Item added</value>
   </data>
   <data name="NoFavorites" xml:space="preserve">
     <value>There are no favourites in your vault.</value>
@@ -632,7 +632,7 @@
     <value>Other</value>
   </data>
   <data name="PasswordGenerated" xml:space="preserve">
-    <value>Password generated.</value>
+    <value>Password generated</value>
   </data>
   <data name="PasswordGenerator" xml:space="preserve">
     <value>Password generator</value>
@@ -647,7 +647,7 @@
     <value>Are you sure you want to overwrite the current password?</value>
   </data>
   <data name="PushNotificationAlert" xml:space="preserve">
-    <value>Bitwarden keeps your vault automatically synced by using push notifications. For the best possible experience, please select "Allow" on the following prompt when asked to enable push notifications.</value>
+    <value>Bitwarden keeps your vault automatically synced by using push notifications. For the best possible experience, please select "Allow" on the following prompt when asked to allow push notifications.</value>
     <comment>Push notifications for apple products</comment>
   </data>
   <data name="RateTheApp" xml:space="preserve">
@@ -663,7 +663,7 @@
     <value>Re-type master password</value>
   </data>
   <data name="SearchVault" xml:space="preserve">
-    <value>Search Vault</value>
+    <value>Search vault</value>
   </data>
   <data name="Security" xml:space="preserve">
     <value>Security</value>
@@ -681,7 +681,7 @@
     <value>Item information</value>
   </data>
   <data name="ItemUpdated" xml:space="preserve">
-    <value>Item updated.</value>
+    <value>Item saved</value>
   </data>
   <data name="Submitting" xml:space="preserve">
     <value>Submitting...</value>
@@ -692,10 +692,10 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="SyncingComplete" xml:space="preserve">
-    <value>Syncing complete.</value>
+    <value>Syncing complete</value>
   </data>
   <data name="SyncingFailed" xml:space="preserve">
-    <value>Syncing failed.</value>
+    <value>Syncing failed</value>
   </data>
   <data name="SyncVaultNow" xml:space="preserve">
     <value>Sync vault now</value>
@@ -708,7 +708,7 @@
     <value>Two-step login</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?</value>
+    <value>Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?</value>
   </data>
   <data name="UnlockWith" xml:space="preserve">
     <value>Unlock with {0}</value>
@@ -831,7 +831,7 @@
     <comment>For 2FA whenever there are no available providers on this device.</comment>
   </data>
   <data name="NoTwoStepAvailable" xml:space="preserve">
-    <value>This account has two-step login enabled. However, none of the configured two-step providers are supported on this device. Please use a supported device and/or add additional providers that are better supported across devices (such as an authenticator app).</value>
+    <value>This account has two-step login set up, however, none of the configured two-step providers are supported on this device. Please use a supported device and/or add additional providers that are better supported across devices (such as an authenticator app).</value>
   </data>
   <data name="RecoveryCodeTitle" xml:space="preserve">
     <value>Recovery code</value>
@@ -856,7 +856,7 @@
     <comment>For 2FA</comment>
   </data>
   <data name="VerificationEmailSent" xml:space="preserve">
-    <value>Verification email sent.</value>
+    <value>Verification email sent</value>
     <comment>For 2FA</comment>
   </data>
   <data name="YubiKeyInstruction" xml:space="preserve">
@@ -1080,7 +1080,7 @@ Scanning will happen automatically.</value>
     <value>Last name</value>
   </data>
   <data name="FullName" xml:space="preserve">
-    <value>Full Name</value>
+    <value>Full name</value>
   </data>
   <data name="LicenseNumber" xml:space="preserve">
     <value>Licence number</value>
@@ -1301,7 +1301,7 @@ Scanning will happen automatically.</value>
     <value>Access your vault directly from your keyboard to quickly auto-fill passwords.</value>
   </data>
   <data name="AutofillTurnOn" xml:space="preserve">
-    <value>To enable password auto-fill on your device, follow these instructions:</value>
+    <value>To set up password auto-fill on your device, follow these instructions:</value>
   </data>
   <data name="AutofillTurnOn1" xml:space="preserve">
     <value>1. Go to the iOS "Settings" app</value>
@@ -1381,10 +1381,10 @@ Scanning will happen automatically.</value>
     <value>Search collection</value>
   </data>
   <data name="SearchFileSends" xml:space="preserve">
-    <value>Search File Sends</value>
+    <value>Search file Sends</value>
   </data>
   <data name="SearchTextSends" xml:space="preserve">
-    <value>Search Text Sends</value>
+    <value>Search text Sends</value>
   </data>
   <data name="SearchGroup" xml:space="preserve">
     <value>Search {0}</value>
@@ -1480,7 +1480,7 @@ Scanning will happen automatically.</value>
     <value>Unlock</value>
   </data>
   <data name="UnlockVault" xml:space="preserve">
-    <value>Unlock Vault</value>
+    <value>Unlock vault</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutes</value>
@@ -1553,10 +1553,10 @@ Scanning will happen automatically.</value>
     <value>Default dark theme</value>
   </data>
   <data name="DefaultDarkThemeDescription" xml:space="preserve">
-    <value>Choose the dark theme to use when using Default (System) theme while your device's dark mode is enabled.</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>Copy Note</value>
+    <value>Copy note</value>
   </data>
   <data name="Exit" xml:space="preserve">
     <value>Exit</value>
@@ -1595,7 +1595,7 @@ Scanning will happen automatically.</value>
     <value>On app restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
-    <value>Auto-fill makes it easy to securely access your Bitwarden vault from other websites and apps. It looks like you have not enabled an auto-fill service for Bitwarden. Enable auto-fill for Bitwarden from the "Settings" screen.</value>
+    <value>Auto-fill makes it easy to securely access your Bitwarden vault from other websites and apps. It looks like you have not set up an auto-fill service for Bitwarden. Set up auto-fill for Bitwarden from the "Settings" screen.</value>
   </data>
   <data name="ThemeAppliedOnRestart" xml:space="preserve">
     <value>Your theme changes will apply when the app is restarted.</value>
@@ -1629,10 +1629,10 @@ Scanning will happen automatically.</value>
     <value>Use biometrics to unlock</value>
   </data>
   <data name="AccessibilityOverlayPermissionAlert" xml:space="preserve">
-    <value>Bitwarden needs attention - See "Auto-fill Accessibility Service" from Bitwarden Settings</value>
+    <value>Bitwarden needs attention - See "Auto-fill Accessibility Service" from Bitwarden settings</value>
   </data>
   <data name="BitwardenAutofillServiceOverlayPermission" xml:space="preserve">
-    <value>3. On the Android App Settings screen for Bitwarden, go to the "Display over other apps" options (under Advanced) and tap the toggle to enable overlay support.</value>
+    <value>3. On the Android App Settings screen for Bitwarden, go to the "Display over other apps" options (under Advanced) and tap the toggle to allow overlay support.</value>
   </data>
   <data name="OverlayPermission" xml:space="preserve">
     <value>Permission</value>
@@ -1659,7 +1659,7 @@ Scanning will happen automatically.</value>
     <value>Send a verification code to your email</value>
   </data>
   <data name="CodeSent" xml:space="preserve">
-    <value>Code Sent!</value>
+    <value>Code sent!</value>
   </data>
   <data name="ConfirmYourIdentity" xml:space="preserve">
     <value>Confirm your identity to continue.</value>
@@ -1674,7 +1674,7 @@ Scanning will happen automatically.</value>
     <value>Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account.</value>
   </data>
   <data name="ExportVaultConfirmationTitle" xml:space="preserve">
-    <value>Confirm Vault Export</value>
+    <value>Confirm vault export</value>
     <comment>Title for the alert to confirm vault exports.</comment>
   </data>
   <data name="Warning" xml:space="preserve">
@@ -1704,7 +1704,7 @@ Scanning will happen automatically.</value>
     <value>Attachment saved successfully</value>
   </data>
   <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
-    <value>Please enable "Auto-fill accessibility service" from Bitwarden settings to use the auto-fill tile.</value>
+    <value>Please turn on "Auto-fill Accessibility Service" from Bitwarden Settings to use the Auto-fill tile.</value>
   </data>
   <data name="AutofillTileUriNotFound" xml:space="preserve">
     <value>No password fields detected</value>
@@ -1726,7 +1726,7 @@ Scanning will happen automatically.</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Item has been restored.</value>
+    <value>Item restored</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
@@ -1756,7 +1756,7 @@ Scanning will happen automatically.</value>
     <value>Biometric unlock for autofill disabled pending verification of master password.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
-    <value>Enable sync on refresh</value>
+    <value>Allow sync on refresh</value>
   </data>
   <data name="EnableSyncOnRefreshDescription" xml:space="preserve">
     <value>Syncing vault with pull down gesture.</value>
@@ -1822,8 +1822,7 @@ Scanning will happen automatically.</value>
     <value>Privacy policy</value>
   </data>
   <data name="AccessibilityDrawOverPermissionAlert" xml:space="preserve">
-    <value>Bitwarden needs attention - Enable "Draw-Over" in "Auto-fill Services" from Bitwarden Settings
-</value>
+    <value>Bitwarden needs attention - Turn on "Draw-Over" in "Auto-fill Services" from Bitwarden Settings</value>
   </data>
   <data name="AutofillServices" xml:space="preserve">
     <value>Auto-fill services</value>
@@ -1832,45 +1831,37 @@ Scanning will happen automatically.</value>
     <value>Use inline autofill</value>
   </data>
   <data name="InlineAutofillDescription" xml:space="preserve">
-    <value>Use inline autofill if your selected IME (keyboard) supports it. If your configuration is not supported (or this option is disabled), the default Autofill overlay will be used.
-</value>
+    <value>Use inline autofill if your selected IME (keyboard) supports it. If your configuration is not supported (or this option is turned off), the default Autofill overlay will be used.</value>
   </data>
   <data name="Accessibility" xml:space="preserve">
     <value>Use accessibility</value>
   </data>
   <data name="AccessibilityDescription" xml:space="preserve">
-    <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. When enabled, we'll display a popup when login fields are selected.
-</value>
+    <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. When set up, we'll display a popup when login fields are selected.</value>
   </data>
   <data name="AccessibilityDescription2" xml:space="preserve">
-    <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. (Requires Draw-Over to be enabled as well)
-</value>
+    <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. (Requires Draw-Over to be turned on as well)</value>
   </data>
   <data name="AccessibilityDescription3" xml:space="preserve">
-    <value>Use the Bitwarden Accessibility Service to use the Autofill Quick-Action Tile, and/or show a popup using Draw-Over (if enabled).
-</value>
+    <value>Use the Bitwarden Accessibility Service to use the Autofill Quick-Action Tile, and/or show a popup using Draw-Over (if turned on).</value>
   </data>
   <data name="AccessibilityDescription4" xml:space="preserve">
-    <value>Required to use the Autofill Quick-Action Tile, or to augment the Autofill Service by using Draw-Over (if enabled).
-</value>
+    <value>Required to use the Autofill Quick-Action Tile, or to augment the Autofill Service by using Draw-Over (if turned on).</value>
   </data>
   <data name="DrawOver" xml:space="preserve">
     <value>Use draw-over</value>
   </data>
   <data name="DrawOverDescription" xml:space="preserve">
-    <value>When enabled, allows the Bitwarden Accessibility Service to display a popup when login fields are selected.
-</value>
+    <value>Allows the Bitwarden Accessibility Service to display a popup when login fields are selected.</value>
   </data>
   <data name="DrawOverDescription2" xml:space="preserve">
-    <value>If enabled, the Bitwarden Accessibility Service will display a popup when login fields are selected to assist with auto-filling your logins.
-</value>
+    <value>If turned on, the Bitwarden Accessibility Service will display a popup when login fields are selected to assist with auto-filling your logins.</value>
   </data>
   <data name="DrawOverDescription3" xml:space="preserve">
-    <value>If enabled, accessibility will show a popup to augment the Autofill Service for older apps that don't support the Android Autofill Framework.
-</value>
+    <value>If turned on, accessibility will show a popup to augment the Autofill Service for older apps that don't support the Android Autofill Framework.</value>
   </data>
   <data name="PersonalOwnershipSubmitError" xml:space="preserve">
-    <value>Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organisation and choose from available Collections.</value>
+    <value>Due to an enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organisation and choose from available collections.</value>
   </data>
   <data name="PersonalOwnershipPolicyInEffect" xml:space="preserve">
     <value>An organisation policy is affecting your ownership options.</value>
@@ -1923,10 +1914,10 @@ Scanning will happen automatically.</value>
     <value>Text type is not selected, tap to select.</value>
   </data>
   <data name="DeletionDate" xml:space="preserve">
-    <value>Deletion Date</value>
+    <value>Deletion date</value>
   </data>
   <data name="DeletionTime" xml:space="preserve">
-    <value>Deletion Time</value>
+    <value>Deletion time</value>
   </data>
   <data name="DeletionDateInfo" xml:space="preserve">
     <value>The Send will be permanently deleted on the specified date and time.</value>
@@ -1936,10 +1927,10 @@ Scanning will happen automatically.</value>
     <value>Pending deletion</value>
   </data>
   <data name="ExpirationDate" xml:space="preserve">
-    <value>Expiration Date</value>
+    <value>Expiration date</value>
   </data>
   <data name="ExpirationTime" xml:space="preserve">
-    <value>Expiration Time</value>
+    <value>Expiration time</value>
   </data>
   <data name="ExpirationDateInfo" xml:space="preserve">
     <value>If set, access to this Send will expire on the specified date and time.</value>
@@ -1949,7 +1940,7 @@ Scanning will happen automatically.</value>
     <value>Expired</value>
   </data>
   <data name="MaximumAccessCount" xml:space="preserve">
-    <value>Maximum Access Count</value>
+    <value>Maximum access count</value>
   </data>
   <data name="MaximumAccessCountInfo" xml:space="preserve">
     <value>If set, users will no longer be able to access this send once the maximum access count is reached.</value>
@@ -1959,17 +1950,17 @@ Scanning will happen automatically.</value>
     <value>Max access count reached</value>
   </data>
   <data name="CurrentAccessCount" xml:space="preserve">
-    <value>Current Access Count</value>
+    <value>Current access count</value>
   </data>
   <data name="NewPassword" xml:space="preserve">
-    <value>New Password</value>
+    <value>New password</value>
   </data>
   <data name="PasswordInfo" xml:space="preserve">
     <value>Optionally require a password for users to access this Send.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="RemovePassword" xml:space="preserve">
-    <value>Remove Password</value>
+    <value>Remove password</value>
   </data>
   <data name="AreYouSureRemoveSendPassword" xml:space="preserve">
     <value>Are you sure you want to remove the password?</value>
@@ -1985,7 +1976,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="DisableSend" xml:space="preserve">
-    <value>Disable this Send so that no one can access it</value>
+    <value>Deactivate this Send so that no one can access it</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NoSends" xml:space="preserve">
@@ -1997,10 +1988,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="CopyLink" xml:space="preserve">
-    <value>Copy Link</value>
+    <value>Copy link</value>
   </data>
   <data name="ShareLink" xml:space="preserve">
-    <value>Share Link</value>
+    <value>Share link</value>
   </data>
   <data name="SendLink" xml:space="preserve">
     <value>Send link</value>
@@ -2015,7 +2006,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="AddSend" xml:space="preserve">
-    <value>Add Send</value>
+    <value>New Send</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AreYouSureDeleteSend" xml:space="preserve">
@@ -2023,15 +2014,15 @@ 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="SendDeleted" xml:space="preserve">
-    <value>Send has been deleted.</value>
+    <value>Send deleted</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendUpdated" xml:space="preserve">
-    <value>Send updated.</value>
+    <value>Send saved</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NewSendCreated" xml:space="preserve">
-    <value>New send created.</value>
+    <value>Send created</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">
@@ -2089,37 +2080,37 @@ Scanning will happen automatically.</value>
     <value>This action is protected, to continue please re-enter your master password to verify your identity.</value>
   </data>
   <data name="CaptchaRequired" xml:space="preserve">
-    <value>Captcha Required</value>
+    <value>Captcha required</value>
   </data>
   <data name="CaptchaFailed" xml:space="preserve">
-    <value>Captcha Failed. Please try again.</value>
+    <value>Captcha failed. Please try again.</value>
   </data>
   <data name="UpdatedMasterPassword" xml:space="preserve">
-    <value>Updated Master Password</value>
+    <value>Updated master password</value>
   </data>
   <data name="UpdateMasterPassword" xml:space="preserve">
-    <value>Update Master Password</value>
+    <value>Update master password</value>
   </data>
   <data name="UpdateMasterPasswordWarning" xml:space="preserve">
-    <value>Your Master Password was recently changed by an administrator in your organisation. 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>
+    <value>Your master password was recently changed by an administrator in your organisation. 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="UpdatingPassword" xml:space="preserve">
-    <value>Updating Password</value>
+    <value>Updating password</value>
   </data>
   <data name="UpdatePasswordError" xml:space="preserve">
     <value>Currently unable to update password</value>
   </data>
   <data name="RemoveMasterPassword" xml:space="preserve">
-    <value>Remove Master Password</value>
+    <value>Remove master password</value>
   </data>
   <data name="RemoveMasterPasswordWarning" xml:space="preserve">
-    <value>{0} is using SSO with customer-managed encryption. Continuing will remove your Master Password from your account and require SSO to login.</value>
+    <value>{0} is using SSO with customer-managed encryption. Continuing will remove your master password from your account and require SSO to login.</value>
   </data>
   <data name="RemoveMasterPasswordWarning2" xml:space="preserve">
-    <value>If you do not want to remove your Master Password, you may leave this organisation.</value>
+    <value>If you do not want to remove your master password, you may leave this organisation.</value>
   </data>
   <data name="LeaveOrganization" xml:space="preserve">
-    <value>Leave Organisation</value>
+    <value>Leave organisation</value>
   </data>
   <data name="LeaveOrganizationName" xml:space="preserve">
     <value>Leave {0}?</value>
@@ -2128,7 +2119,7 @@ Scanning will happen automatically.</value>
     <value>FIDO2 WebAuthn</value>
   </data>
   <data name="Fido2Instruction" xml:space="preserve">
-    <value>To continue, have your FIDO2 WebAuthn enabled security key ready, then follow the instructions after clicking 'Authenticate WebAuthn' on the next screen.</value>
+    <value>To continue, have your FIDO2 WebAuthn compatible security key ready, then follow the instructions after clicking 'Authenticate WebAuthn' on the next screen.</value>
   </data>
   <data name="Fido2Desc" xml:space="preserve">
     <value>Authentication using FIDO2 WebAuthn, you can authenticate using an external security key.</value>
@@ -2137,7 +2128,7 @@ Scanning will happen automatically.</value>
     <value>Authenticate WebAuthn</value>
   </data>
   <data name="Fido2ReturnToApp" xml:space="preserve">
-    <value>Return to App</value>
+    <value>Return to app</value>
   </data>
   <data name="Fido2CheckBrowser" xml:space="preserve">
     <value>Please make sure your default browser supports WebAuthn and try again.</value>
@@ -2146,16 +2137,16 @@ Scanning will happen automatically.</value>
     <value>This organisation has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organisation administrators to change your master password.</value>
   </data>
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organisation policies are affecting your vault timeout. Maximum allowed Vault Timeout is {0} hour(s) and {1} minute(s)</value>
+    <value>Your organisation 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 organisation.</value>
   </data>
   <data name="DisablePersonalVaultExportPolicyInEffect">
-    <value>One or more organisation policies prevents your from exporting your personal vault.</value>
+    <value>One or more organisation policies prevents your from exporting your individual vault.</value>
   </data>
   <data name="AddAccount" xml:space="preserve">
-    <value>Add Account</value>
+    <value>Add account</value>
   </data>
   <data name="AccountUnlocked" xml:space="preserve">
     <value>Unlocked</value>
@@ -2164,13 +2155,13 @@ Scanning will happen automatically.</value>
     <value>Locked</value>
   </data>
   <data name="AccountLoggedOut" xml:space="preserve">
-    <value>Logged Out</value>
+    <value>Logged out</value>
   </data>
   <data name="AccountSwitchedAutomatically" xml:space="preserve">
     <value>Switched to next available account</value>
   </data>
   <data name="AccountLockedSuccessfully" xml:space="preserve">
-    <value>Account Locked</value>
+    <value>Account locked</value>
   </data>
   <data name="AccountLoggedOutSuccessfully" xml:space="preserve">
     <value>Account logged out successfully</value>
@@ -2194,13 +2185,13 @@ Scanning will happen automatically.</value>
     <value>Your account has been permanently deleted</value>
   </data>
   <data name="InvalidVerificationCode" xml:space="preserve">
-    <value>Invalid Verification Code.</value>
+    <value>Invalid verification code</value>
   </data>
   <data name="RequestOTP" xml:space="preserve">
     <value>Request one-time password</value>
   </data>
   <data name="SendCode" xml:space="preserve">
-    <value>Send Code</value>
+    <value>Send code</value>
   </data>
   <data name="Sending" xml:space="preserve">
     <value>Sending</value>
@@ -2215,7 +2206,7 @@ Scanning will happen automatically.</value>
     <value>Verifying</value>
   </data>
   <data name="ResendCode" xml:space="preserve">
-    <value>Resend Code</value>
+    <value>Resend code</value>
   </data>
   <data name="AVerificationCodeWasSentToYourEmail" xml:space="preserve">
     <value>A verification code was sent to your email</value>
@@ -2248,7 +2239,7 @@ Scanning will happen automatically.</value>
     <value>Numbers (0 to 9)</value>
   </data>
   <data name="SpecialCharacters" xml:space="preserve">
-    <value>Special Characters (!@#$%^&amp;*)</value>
+    <value>Special characters (!@#$%^&amp;*)</value>
   </data>
   <data name="TapToGoBack" xml:space="preserve">
     <value>Tap to go back</value>
@@ -2263,7 +2254,7 @@ Scanning will happen automatically.</value>
     <value>Filter items by vault</value>
   </data>
   <data name="AllVaults" xml:space="preserve">
-    <value>All Vaults</value>
+    <value>All vaults</value>
   </data>
   <data name="Vaults" xml:space="preserve">
     <value>Vaults</value>
@@ -2278,7 +2269,7 @@ Scanning will happen automatically.</value>
     <value>TOTP</value>
   </data>
   <data name="VerificationCodes" xml:space="preserve">
-    <value>Verification Codes</value>
+    <value>Verification codes</value>
   </data>
   <data name="PremiumSubscriptionRequired" xml:space="preserve">
     <value>Premium subscription required</value>
@@ -2293,10 +2284,10 @@ Scanning will happen automatically.</value>
     <value>Cannot scan QR Code? </value>
   </data>
   <data name="AuthenticatorKeyScanner" xml:space="preserve">
-    <value>Authenticator Key</value>
+    <value>Authenticator key</value>
   </data>
   <data name="EnterKeyManually" xml:space="preserve">
-    <value>Enter Key Manually</value>
+    <value>Enter key manually</value>
   </data>
   <data name="AddTotp" xml:space="preserve">
     <value>Add TOTP</value>
@@ -2308,9 +2299,6 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <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>
@@ -2324,7 +2312,7 @@ select Add TOTP to store the key safely</value>
     <value>Allow screen capture</value>
   </data>
   <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
-    <value>Are you sure you want to enable Screen Capture?</value>
+    <value>Are you sure you want to turn on screen capture?</value>
   </data>
   <data name="LogInRequested" xml:space="preserve">
     <value>Login requested</value>
@@ -2387,34 +2375,34 @@ select Add TOTP to store the key safely</value>
     <value>All notifications</value>
   </data>
   <data name="PasswordType" xml:space="preserve">
-    <value>Password Type</value>
+    <value>Password type</value>
   </data>
   <data name="WhatWouldYouLikeToGenerate" xml:space="preserve">
     <value>What would you like to generate?</value>
   </data>
   <data name="UsernameType" xml:space="preserve">
-    <value>Username Type</value>
+    <value>Username type</value>
   </data>
   <data name="PlusAddressedEmail" xml:space="preserve">
-    <value>Plus Addressed Email</value>
+    <value>Plus addressed email</value>
   </data>
   <data name="CatchAllEmail" xml:space="preserve">
-    <value>Catch-all Email</value>
+    <value>Catch-all email</value>
   </data>
   <data name="ForwardedEmailAlias" xml:space="preserve">
-    <value>Forwarded Email Alias</value>
+    <value>Forwarded email alias</value>
   </data>
   <data name="RandomWord" xml:space="preserve">
-    <value>Random Word</value>
+    <value>Random word</value>
   </data>
   <data name="EmailRequiredParenthesis" xml:space="preserve">
     <value>Email (required)</value>
   </data>
   <data name="DomainNameRequiredParenthesis" xml:space="preserve">
-    <value>Domain Name (required)</value>
+    <value>Domain name (required)</value>
   </data>
   <data name="APIKeyRequiredParenthesis" xml:space="preserve">
-    <value>API Key (required)</value>
+    <value>API key (required)</value>
   </data>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
@@ -2432,13 +2420,13 @@ select Add TOTP to store the key safely</value>
     <comment>"SimpleLogin" is the product name and should not be translated.</comment>
   </data>
   <data name="APIAccessToken" xml:space="preserve">
-    <value>API Access Token</value>
+    <value>API access token</value>
   </data>
   <data name="AreYouSureYouWantToOverwriteTheCurrentUsername" xml:space="preserve">
     <value>Are you sure you want to overwrite the current username?</value>
   </data>
   <data name="GenerateUsername" xml:space="preserve">
-    <value>Generate Username</value>
+    <value>Generate username</value>
   </data>
   <data name="EmailType" xml:space="preserve">
     <value>Email Type</value>
@@ -2461,6 +2449,9 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Connect to Watch</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2481,4 +2472,46 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>New around here?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Get master password hint</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Not you?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Log in with master password</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Log in with another device</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Log in initiated</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>A notification has been sent to your device.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <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>Resend notification</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Need another option?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>View all log in options</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>This request is no longer valid</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Enable camera permission to use the scanner</value>
+  </data>
 </root>

src/App/Resources/AppResources.en-IN.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} has been copied.</value>
-    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verify fingerprint</value>
@@ -808,7 +808,7 @@
     <value>You are searching for an auto-fill item for "{0}".</value>
   </data>
   <data name="LearnOrg" xml:space="preserve">
-    <value>Learn about organizations</value>
+    <value>Learn about organisations</value>
   </data>
   <data name="CannotOpenApp" xml:space="preserve">
     <value>Cannot open the app "{0}".</value>
@@ -1428,13 +1428,13 @@ Scanning will happen automatically.</value>
     <value>Share item</value>
   </data>
   <data name="MoveToOrganization" xml:space="preserve">
-    <value>Move to Organization</value>
+    <value>Move to Organisation</value>
   </data>
   <data name="NoOrgsToList" xml:space="preserve">
     <value>No organisations to list.</value>
   </data>
   <data name="MoveToOrgDesc" xml:space="preserve">
-    <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>
+    <value>Choose an organisation that you wish to move this item to. Moving to an organisation transfers ownership of the item to that organisation. 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>Number of words</value>
@@ -1465,7 +1465,7 @@ Scanning will happen automatically.</value>
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
   <data name="LearnOrgConfirmation" xml:space="preserve">
-    <value>Bitwarden allows you to share your vault items with others by using an organization account. Would you like to visit the bitwarden.com website to learn more?</value>
+    <value>Bitwarden allows you to share your vault items with others by using an organisation account. Would you like to visit the bitwarden.com website to learn more?</value>
   </data>
   <data name="ExportVault" xml:space="preserve">
     <value>Export vault</value>
@@ -2313,9 +2313,6 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
-  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <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>
@@ -2466,6 +2463,9 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
+  <data name="ConnectToWatch" xml:space="preserve">
+    <value>Connect to Watch</value>
+  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2486,4 +2486,46 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
+  <data name="NewAroundHere" xml:space="preserve">
+    <value>New around here?</value>
+  </data>
+  <data name="GetMasterPasswordwordHint" xml:space="preserve">
+    <value>Get master password hint</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="NotYou" xml:space="preserve">
+    <value>Not you?</value>
+  </data>
+  <data name="LogInWithMasterPassword" xml:space="preserve">
+    <value>Log in with master password</value>
+  </data>
+  <data name="LogInWithAnotherDevice" xml:space="preserve">
+    <value>Log In with another device</value>
+  </data>
+  <data name="LogInInitiated" xml:space="preserve">
+    <value>Log in initiated</value>
+  </data>
+  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
+    <value>A notification has been sent to your device.</value>
+  </data>
+  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
+    <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>Resend notification</value>
+  </data>
+  <data name="NeedAnotherOption" xml:space="preserve">
+    <value>Need another option?</value>
+  </data>
+  <data name="ViewAllLoginOptions" xml:space="preserve">
+    <value>View all log in options</value>
+  </data>
+  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
+    <value>This request is no longer valid</value>
+  </data>
+  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
+    <value>Enable camera permission to use the scanner</value>
+  </data>
 </root>