[SG-471] Added mock services. Added Accept/reject command binding, navigation and toast messages.

* [SG-467] Fixed url validation so it works with or without http or https

* [SG-467] Validation has been refactored for simplicity.

.github/workflows/release.yml

@@ -54,17 +54,26 @@ jobs:
           echo "::set-output name=branch-name::$BRANCH_NAME"
 
       - name: Download all artifacts
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
           workflow: build.yml
           workflow_conclusion: success
           branch: ${{ steps.branch.outputs.branch-name }}
 
+      - name: Download all artifacts
+        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        with:
+          workflow: build.yml
+          workflow_conclusion: success
+          branch: master
+
       - name: Prep Bitwarden iOS release asset
         run: zip -r Bitwarden\ iOS.zip Bitwarden\ iOS
 
       - name: Create release
-        if: github.event.inputs.release_type != 'Dry Run'
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01  # v1.9.0
         with:
           artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
@@ -89,6 +98,7 @@ jobs:
         uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
 
       - name: Download F-Droid .apk artifact
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
           workflow: build.yml
@@ -96,6 +106,15 @@ jobs:
           branch: ${{ needs.release.outputs.branch-name }}
           name: com.x8bit.bitwarden-fdroid.apk
 
+      - name: Download F-Droid .apk artifact
+        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        with:
+          workflow: build.yml
+          workflow_conclusion: success
+          branch: master
+          name: com.x8bit.bitwarden-fdroid.apk
+
       - name: Set up Node
         uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561  # v2.5.1
         with:
@@ -161,5 +180,5 @@ jobs:
           cd $GITHUB_WORKSPACE
 
       - name: Deploy to gh-pages
-        if: github.event.inputs.release_type != 'Dry Run'
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: npm run deploy

src/Android/Properties/AndroidManifest.xml

@@ -12,7 +12,7 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY"/>
-  <uses-permission android:name="android.permission.VIBRATE" />
+
   <uses-feature android:name="android.hardware.camera" android:required="false"/>
   <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
 

src/App/App.csproj

@@ -122,6 +122,9 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Remove="Pages\Accounts\AccountsPopupPage.xaml.cs" />
+    <Compile Update="Pages\Accounts\LoginPasswordlessPage.xaml.cs">
+      <DependentUpon>LoginPasswordlessPage.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>

src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
-                       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                       x:Class="Bit.App.Controls.AuthenticatorViewCell"
-                       xmlns:controls="clr-namespace:Bit.App.Controls"
-                       xmlns:pages="clr-namespace:Bit.App.Pages"
-                       xmlns:u="clr-namespace:Bit.App.Utilities"
-                       xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
-                       xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-                       StyleClass="list-row, list-row-platform"
-                       HorizontalOptions="FillAndExpand"
-                       x:DataType="pages:GroupingsPageTOTPListItem"
-                       ColumnDefinitions="40,*,40,Auto,40"
-                       RowSpacing="0"
-                       Padding="0,10,0,0"
-                       RowDefinitions="*,*">
-
-    <Grid.Resources>
-        <u:IconGlyphConverter x:Key="iconGlyphConverter" />
-        <u:InverseBoolConverter x:Key="inverseBool" />
-    </Grid.Resources>
-
-    <controls:IconLabel
-        Grid.Column="0"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        StyleClass="list-icon, list-icon-platform"
-        Grid.RowSpan="2"
-        IsVisible="{Binding ShowIconImage, Converter={StaticResource inverseBool}}"
-        Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <ff:CachedImage
-        Grid.Column="0"
-        BitmapOptimizations="True"
-        ErrorPlaceholder="login.png"
-        LoadingPlaceholder="login.png"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        WidthRequest="22"
-        HeightRequest="22"
-        Grid.RowSpan="2"
-        IsVisible="{Binding ShowIconImage}"
-        Source="{Binding IconImageSource, Mode=OneTime}"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <Label
-        LineBreakMode="TailTruncation"
-        Grid.Column="1"
-        Grid.Row="0"
-        VerticalTextAlignment="Center"
-        VerticalOptions="Fill"
-        StyleClass="list-title, list-title-platform"
-        Text="{Binding Cipher.Name}" />
-
-    <Label
-        LineBreakMode="TailTruncation"
-        Grid.Column="1"
-        Grid.Row="1"
-        VerticalTextAlignment="Center"
-        VerticalOptions="Fill"
-        StyleClass="list-subtitle, list-subtitle-platform"
-        Text="{Binding Cipher.SubTitle}" />
-
-    <controls:CircularProgressbarView
-        Progress="{Binding Progress}"
-        Grid.Row="0"
-        Grid.Column="2"
-        Grid.RowSpan="2"
-        HorizontalOptions="Fill"
-        VerticalOptions="CenterAndExpand" />
-
-    <Label
-        Text="{Binding TotpSec, Mode=OneWay}"
-        Style="{DynamicResource textTotp}"
-        Grid.Row="0"
-        Grid.Column="2"
-        Grid.RowSpan="2"
-        StyleClass="text-sm"
-        HorizontalTextAlignment="Center"
-        HorizontalOptions="Fill"
-        VerticalTextAlignment="Center"
-        VerticalOptions="Fill" />
-    
-    <StackLayout
-        Grid.Row="0"
-        Grid.Column="3"
-        Margin="3,0,2,0"
-        Spacing="5"
-        Grid.RowSpan="2"
-        Orientation="Horizontal"
-        HorizontalOptions="Fill"
-        VerticalOptions="Fill">
-
-        <controls:MonoLabel
-            Text="{Binding TotpCodeFormattedStart, Mode=OneWay}"
-            Style="{DynamicResource textTotp}"
-            StyleClass="text-lg"
-            HorizontalTextAlignment="Center"
-            VerticalTextAlignment="Center"
-            HorizontalOptions="Center"
-            VerticalOptions="FillAndExpand" />
-        
-        <controls:MonoLabel
-            Text="{Binding TotpCodeFormattedEnd, Mode=OneWay}"
-            Style="{DynamicResource textTotp}"
-            StyleClass="text-lg"
-            HorizontalTextAlignment="Center"
-            VerticalTextAlignment="Center"
-            HorizontalOptions="Center"
-            VerticalOptions="FillAndExpand" />
-    </StackLayout>
-
-    <controls:IconButton
-        StyleClass="box-row-button, box-row-button-platform"
-        Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-        Command="{Binding CopyCommand}"
-        CommandParameter="LoginTotp"
-        Grid.Row="0"
-        Grid.Column="4"
-        Grid.RowSpan="2"
-        Padding="0,0,1,0"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n CopyTotp}" />
-</controls:ExtendedGrid>

src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs

@@ -1,67 +0,0 @@
-using System;
-using Bit.App.Pages;
-using Bit.App.Utilities;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class AuthenticatorViewCell : ExtendedGrid
-    {
-        public static readonly BindableProperty CipherProperty = BindableProperty.Create(
-            nameof(Cipher), typeof(CipherView), typeof(AuthenticatorViewCell), default(CipherView), BindingMode.TwoWay);
-
-        public static readonly BindableProperty WebsiteIconsEnabledProperty = BindableProperty.Create(
-            nameof(WebsiteIconsEnabled), typeof(bool?), typeof(AuthenticatorViewCell));
-
-        public static readonly BindableProperty TotpSecProperty = BindableProperty.Create(
-            nameof(TotpSec), typeof(long), typeof(AuthenticatorViewCell));
-
-        public AuthenticatorViewCell()
-        {
-            InitializeComponent();
-        }
-
-        public Command CopyCommand { get; set; }
-
-        public CipherView Cipher
-        {
-            get => GetValue(CipherProperty) as CipherView;
-            set => SetValue(CipherProperty, value);
-        }
-
-        public bool? WebsiteIconsEnabled
-        {
-            get => (bool)GetValue(WebsiteIconsEnabledProperty);
-            set => SetValue(WebsiteIconsEnabledProperty, value);
-        }
-
-        public long TotpSec
-        {
-            get => (long)GetValue(TotpSecProperty);
-            set => SetValue(TotpSecProperty, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled ?? false
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        private string _iconImageSource = string.Empty;
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-    }
-}

src/App/Controls/CircularProgressbarView.cs

@@ -1,139 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using SkiaSharp;
-using SkiaSharp.Views.Forms;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class CircularProgressbarView : SKCanvasView
-    {
-        private Circle _circle;
-
-        public static readonly BindableProperty ProgressProperty = BindableProperty.Create(
-            nameof(Progress), typeof(double), typeof(CircularProgressbarView), propertyChanged: OnProgressChanged);
-
-        public static readonly BindableProperty RadiusProperty = BindableProperty.Create(
-            nameof(Radius), typeof(float), typeof(CircularProgressbarView), 15f);
-
-        public static readonly BindableProperty StrokeWidthProperty = BindableProperty.Create(
-            nameof(StrokeWidth), typeof(float), typeof(CircularProgressbarView), 3f);
-
-        public static readonly BindableProperty ProgressColorProperty = BindableProperty.Create(
-            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
-
-        public static readonly BindableProperty EndingProgressColorProperty = BindableProperty.Create(
-            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
-
-        public static readonly BindableProperty BackgroundProgressColorProperty = BindableProperty.Create(
-            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
-
-        public double Progress
-        {
-            get { return (double)GetValue(ProgressProperty); }
-            set { SetValue(ProgressProperty, value); }
-        }
-
-        public float Radius
-        {
-            get => (float)GetValue(RadiusProperty);
-            set => SetValue(RadiusProperty, value);
-        }
-        public float StrokeWidth
-        {
-            get => (float)GetValue(StrokeWidthProperty);
-            set => SetValue(StrokeWidthProperty, value);
-        }
-
-        public Color ProgressColor
-        {
-            get => (Color)GetValue(ProgressColorProperty);
-            set => SetValue(ProgressColorProperty, value);
-        }
-
-        public Color EndingProgressColor
-        {
-            get => (Color)GetValue(EndingProgressColorProperty);
-            set => SetValue(EndingProgressColorProperty, value);
-        }
-
-        public Color BackgroundProgressColor
-        {
-            get => (Color)GetValue(BackgroundProgressColorProperty);
-            set => SetValue(BackgroundProgressColorProperty, value);
-        }
-
-        private static void OnProgressChanged(BindableObject bindable, object oldvalue, object newvalue)
-        {
-            var context = bindable as CircularProgressbarView;
-            context.InvalidateSurface();
-        }
-
-        protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            base.OnPropertyChanged(propertyName);
-            if (propertyName == nameof(Progress))
-            {
-                _circle = new Circle(Radius * (float)DeviceDisplay.MainDisplayInfo.Density, (info) => new SKPoint((float)info.Width / 2, (float)info.Height / 2));
-            }
-        }
-
-        protected override void OnPaintSurface(SKPaintSurfaceEventArgs e)
-        {
-            base.OnPaintSurface(e);
-            if (_circle != null)
-            {
-                _circle.CalculateCenter(e.Info);
-                e.Surface.Canvas.Clear();
-                DrawCircle(e.Surface.Canvas, _circle, StrokeWidth * (float)DeviceDisplay.MainDisplayInfo.Density, BackgroundProgressColor.ToSKColor());
-                DrawArc(e.Surface.Canvas, _circle, () => (float)Progress, StrokeWidth * (float)DeviceDisplay.MainDisplayInfo.Density, ProgressColor.ToSKColor(), EndingProgressColor.ToSKColor());
-            }
-        }
-
-        private void DrawCircle(SKCanvas canvas, Circle circle, float strokewidth, SKColor color)
-        {
-            canvas.DrawCircle(circle.Center, circle.Redius,
-                new SKPaint()
-                {
-                    StrokeWidth = strokewidth,
-                    Color = color,
-                    IsStroke = true,
-                    IsAntialias = true
-                });
-        }
-
-        private void DrawArc(SKCanvas canvas, Circle circle, Func<float> progress, float strokewidth, SKColor color, SKColor progressEndColor)
-        {
-            var progressValue = progress();
-            var angle = progressValue * 3.6f;
-            canvas.DrawArc(circle.Rect, 270, angle, false,
-                new SKPaint()
-                {
-                    StrokeWidth = strokewidth,
-                    Color = progressValue < 20f ? progressEndColor : color,
-                    IsStroke = true,
-                    IsAntialias = true
-                });
-        }
-    }
-
-    public class Circle
-    {
-        private readonly Func<SKImageInfo, SKPoint> _centerFunc;
-
-        public Circle(float redius, Func<SKImageInfo, SKPoint> centerFunc)
-        {
-            _centerFunc = centerFunc;
-            Redius = redius;
-        }
-        public SKPoint Center { get; set; }
-        public float Redius { get; set; }
-        public SKRect Rect => new SKRect(Center.X - Redius, Center.Y - Redius, Center.X + Redius, Center.Y + Redius);
-
-        public void CalculateCenter(SKImageInfo argsInfo)
-        {
-            Center = _centerFunc(argsInfo);
-        }
-    }
-}

src/App/Pages/Accounts/EnvironmentPageViewModel.cs

@@ -70,7 +70,7 @@ namespace Bit.App.Pages
         {
             bool IsUrlValid(string url)
             {
-                return string.IsNullOrEmpty(url) || Uri.IsWellFormedUriString(url, UriKind.Absolute);
+                return string.IsNullOrEmpty(url) || Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute);
             }
 
             return IsUrlValid(BaseUrl)

src/App/Pages/Accounts/LoginPasswordlessPage.xaml

@@ -0,0 +1,90 @@
+<?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.LoginPasswordlessPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    x:DataType="pages:LoginPasswordlessViewModel"
+    Title="{Binding PageTitle}">
+
+    <ContentPage.BindingContext>
+        <pages:LoginPasswordlessViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" />
+    </ContentPage.ToolbarItems>
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <u:InverseBoolConverter x:Key="inverseBool" />
+            <u:StringHasValueConverter x:Key="stringHasValue" />
+            <u:IsNotNullConverter x:Key="notNull" />
+        </ResourceDictionary>
+    </ContentPage.Resources>
+    <ScrollView x:Name="_scrollView" Padding="7, 0, 7, 20">
+        <StackLayout>
+            <Label
+                Text="{u:I18n AreYouTryingToLogIn}"
+                FontSize="Title"
+                FontAttributes="Bold"
+                Margin="0,14,0,21"/>
+            <Label
+                Text="{Binding LogInAttempByLabel}"
+                FontSize="Small"
+                Margin="0,0,0,24"/>
+            <Label
+                Text="{u:I18n FingerprintPhrase}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <controls:MonoLabel
+                FormattedText="{Binding FingerprintPhraseFormatted}"
+                FontSize="Medium"
+                Margin="0,0,0,27"/>
+            <Label
+                Text="{u:I18n DeviceType}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <Label
+                Text="{Binding DeviceType}"
+                FontSize="Small"
+                Margin="0,0,0,21"/>
+            <Label
+                Text="{u:I18n IpAddress}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <Label
+                Text="{Binding IpAddress}"
+                FontSize="Small"
+                Margin="0,0,0,21"/>
+            <Label
+                Text="{u:I18n Near}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <Label
+                Text="{Binding NearLocation}"
+                FontSize="Small"
+                Margin="0,0,0,21"/>
+            <Label
+                Text="{u:I18n Time}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <Label
+                Text="{Binding TimeOfRequestText}"
+                FontSize="Small"
+                Margin="0,0,0,57"/>
+            <Button
+                Text="{u:I18n ConfirmLogIn}"
+                Command="{Binding AcceptRequestCommand}"
+                Margin="0,0,0,17"
+                StyleClass="btn-primary"/>
+            <Button
+                Text="{u:I18n DenyLogIn}"
+                Command="{Binding RejectRequestCommand}"
+                StyleClass="btn-secundary"/>
+        </StackLayout>
+    </ScrollView>
+
+</pages:BaseContentPage>

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

@@ -0,0 +1,36 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Bit.App.Pages
+{
+    public partial class LoginPasswordlessPage : BaseContentPage
+    {
+        private LoginPasswordlessViewModel _vm;
+
+        public LoginPasswordlessPage(string fingerprintPhrase, string email, string deviceType, string ipAddress, string location, DateTime requestDate)
+        {
+            InitializeComponent();
+            _vm = BindingContext as LoginPasswordlessViewModel;
+            _vm.Page = this;
+            _vm.Email = email;
+            _vm.DeviceType = deviceType;
+            _vm.IpAddress = ipAddress;
+            _vm.NearLocation = location;
+            _vm.FingerprintPhrase = fingerprintPhrase;
+            _vm.RequestDate = requestDate;
+        }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            await Close();
+        }
+
+        public async Task Close()
+        {
+            if (DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
+    }
+}

src/App/Pages/Accounts/LoginPasswordlessViewModel.cs

@@ -0,0 +1,189 @@
+using System;
+using System.Threading.Tasks;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+using Bit.App.Utilities;
+using System.Linq;
+using Xamarin.CommunityToolkit.ObjectModel;
+using System.Windows.Input;
+
+namespace Bit.App.Pages
+{
+    public class LoginPasswordlessViewModel : BaseViewModel
+    {
+        private IAuthService _authService;
+        private IPlatformUtilsService _platformUtilsService;
+        private ILogger _logger;
+        private string _logInAttempByLabel;
+        private string _deviceType;
+        private FormattedString _fingerprintPhraseFormatted;
+        private string _fingerprintPhrase;
+        private string _email;
+        private string _timeOfRequest;
+        private DateTime _requestDate;
+        private string _nearLocation;
+        private string _ipAddress;
+
+        public LoginPasswordlessViewModel()
+        {
+            _authService = ServiceContainer.Resolve<IAuthService>("authService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _logger = ServiceContainer.Resolve<ILogger>("logger");
+
+            PageTitle = AppResources.LogInRequested;
+
+            AcceptRequestCommand = new AsyncCommand(AcceptRequestAsync,
+                onException: ex => _logger.Exception(ex),
+                allowsMultipleExecutions: false);
+            RejectRequestCommand = new AsyncCommand(RejectRequestAsync,
+                onException: ex => _logger.Exception(ex),
+                allowsMultipleExecutions: false);
+        }
+
+        public ICommand AcceptRequestCommand { get; }
+
+        public ICommand RejectRequestCommand { get; }
+
+        public string Email
+        {
+            get => _email;
+            set
+            {
+                LogInAttempByLabel = string.Format(AppResources.LogInAttemptByOn, value, "bitwarden login test");
+                SetProperty(ref _email, value);
+            }
+        }
+
+        public string FingerprintPhrase
+        {
+            get => _fingerprintPhrase;
+            set
+            {
+                FingerprintPhraseFormatted = CreateFingerprintPhrase(value);
+                SetProperty(ref _fingerprintPhrase, value);
+            }
+        }
+
+        public FormattedString FingerprintPhraseFormatted
+        {
+            get => _fingerprintPhraseFormatted;
+            set => SetProperty(ref _fingerprintPhraseFormatted, value);
+        }
+
+        public string LogInAttempByLabel
+        {
+            get => _logInAttempByLabel;
+            set => SetProperty(ref _logInAttempByLabel, value);
+        }
+
+        public string DeviceType
+        {
+            get => _deviceType;
+            set => SetProperty(ref _deviceType, value);
+        }
+
+        public string IpAddress
+        {
+            get => _ipAddress;
+            set => SetProperty(ref _ipAddress, value);
+        }
+
+        public string NearLocation
+        {
+            get => _nearLocation;
+            set => SetProperty(ref _nearLocation, value);
+        }
+
+        public DateTime RequestDate
+        {
+            get => _requestDate;
+            set
+            {
+                TimeOfRequestText = CreateRequestDate();
+                SetProperty(ref _requestDate, value);
+            }
+        }
+
+        public string TimeOfRequestText
+        {
+            get => _timeOfRequest;
+            set
+            {
+                SetProperty(ref _timeOfRequest, value);
+            }
+        }
+
+        private FormattedString CreateFingerprintPhrase(string fingerprintPhrase)
+        {
+            var fingerprintList = fingerprintPhrase.Split('-').ToList();
+            var fs = new FormattedString();
+            var lastFingerprint = fingerprintList.LastOrDefault();
+
+            foreach (var fingerprint in fingerprintList)
+            {
+                fs.Spans.Add(new Span
+                {
+                    Text = fingerprint
+                });
+
+                if(fingerprint == lastFingerprint)
+                {
+                    break;
+                }
+
+                fs.Spans.Add(new Span
+                {
+                    Text = "-",
+                    TextColor = ThemeManager.GetResourceColor("DangerColor")
+                });
+            }
+           
+            return fs;
+        }
+
+        private string CreateRequestDate()
+        {
+            var minutesSinceRequest = RequestDate.ToUniversalTime().Minute - DateTime.UtcNow.Minute;
+            if(minutesSinceRequest < 5)
+            {
+                return  AppResources.JustNow;
+            }
+            if(minutesSinceRequest < 59)
+            {
+                return $"{minutesSinceRequest} {AppResources.MinutesAgo}";
+            }
+
+            return RequestDate.ToShortTimeString();
+        }
+
+        private async Task AcceptRequestAsync()
+        {
+            try
+            {
+                var res = await _authService.LogInPasswordlessAcceptAsync();
+                await ((LoginPasswordlessPage)this.Page).Close();
+                _platformUtilsService.ShowToast("info", null, AppResources.LogInAccepted);
+            }
+            catch (Exception ex)
+            {
+                _logger.Exception(ex);
+            }
+        }
+
+        private async Task RejectRequestAsync()
+        {
+            try
+            {
+                var res = await _authService.LogInPasswordlessRejectAsync();
+                await ((LoginPasswordlessPage)this.Page).Close();
+                _platformUtilsService.ShowToast("info", null, AppResources.LogInDenied);
+            }
+            catch (Exception ex)
+            {
+                _logger.Exception(ex);
+            }
+        }
+    }
+}

src/App/Pages/Vault/AddEditPage.xaml

@@ -184,61 +184,31 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <Label
                             Text="{u:I18n AuthenticatorKey}"
                             StyleClass="box-label"
                             Grid.Row="0"
                             Grid.Column="0" />
-                        <Frame 
-                            IsVisible="{Binding HasTotpValue, Converter={StaticResource inverseBool}}" 
-                            Margin="0,5,0,0"
-                            StyleClass="btn-icon-row"
-                            HorizontalOptions="FillAndExpand"
-                            VerticalOptions="FillAndExpand"
-                            Padding="0"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="3">
-                            <Frame.GestureRecognizers>
-                                <TapGestureRecognizer Tapped="ScanTotp_Clicked" />
-                            </Frame.GestureRecognizers>
-                            <controls:IconLabel 
-                                Text="{Binding SetupTotpText}" 
-                                Padding="0,15"
-                                HorizontalOptions="Center"
-                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center" />
-                        </Frame>
                         <controls:MonoEntry
                             x:Name="_loginTotpEntry"
                             Text="{Binding Cipher.Login.Totp}"
                             IsSpellCheckEnabled="False"
                             IsTextPredictionEnabled="False"
-                            IsVisible="{Binding HasTotpValue}"
                             IsPassword="{Binding Cipher.ViewPassword, Converter={StaticResource inverseBool}}"
                             IsEnabled="{Binding Cipher.ViewPassword}"
                             StyleClass="box-value"
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="{Binding TotpColumnSpan}" />
-                        <controls:IconButton 
-                            StyleClass="box-row-button, box-row-button-platform"
-                            Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-                            Command="{Binding CopyCommand}"
-                            IsVisible="{Binding HasTotpValue}"
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Grid.RowSpan="2" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Camera}}"
                             Clicked="ScanTotp_Clicked"
                             Grid.Row="0"
-                            Grid.Column="2"
+                            Grid.Column="1"
                             Grid.RowSpan="2"
-                            IsVisible="{Binding HasTotpValue}"
+                            IsVisible="{Binding Cipher.ViewPassword}"
                             AutomationProperties.IsInAccessibleTree="True"
                             AutomationProperties.Name="{u:I18n ScanQrTitle}" />
                     </Grid>

src/App/Pages/Vault/AddEditPageViewModel.cs

@@ -11,7 +11,6 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -30,7 +29,6 @@ namespace Bit.App.Pages
         private readonly IEventService _eventService;
         private readonly IPolicyService _policyService;
         private readonly ILogger _logger;
-        private readonly IClipboardService _clipboardService;
 
         private CipherView _cipher;
         private bool _showNotesSeparator;
@@ -55,7 +53,6 @@ namespace Bit.App.Pages
             nameof(ShowUris),
             nameof(ShowAttachments),
             nameof(ShowCollections),
-            nameof(HasTotpValue)
         };
         private List<KeyValuePair<UriMatchType?, string>> _matchDetectionOptions =
             new List<KeyValuePair<UriMatchType?, string>>
@@ -83,7 +80,6 @@ namespace Bit.App.Pages
             _eventService = ServiceContainer.Resolve<IEventService>("eventService");
             _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
             _logger = ServiceContainer.Resolve<ILogger>("logger");
-            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
 
             GeneratePasswordCommand = new Command(GeneratePassword);
             TogglePasswordCommand = new Command(TogglePassword);
@@ -93,7 +89,6 @@ namespace Bit.App.Pages
             UriOptionsCommand = new Command<LoginUriView>(UriOptions);
             FieldOptionsCommand = new Command<AddEditPageFieldViewModel>(FieldOptions);
             PasswordPromptHelpCommand = new Command(PasswordPromptHelp);
-            CopyCommand = new AsyncCommand(CopyTotpClipboardAsync, onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
             Uris = new ExtendedObservableCollection<LoginUriView>();
             Fields = new ExtendedObservableCollection<AddEditPageFieldViewModel>();
             Collections = new ExtendedObservableCollection<CollectionViewModel>();
@@ -155,7 +150,6 @@ namespace Bit.App.Pages
         public Command UriOptionsCommand { get; set; }
         public Command FieldOptionsCommand { get; set; }
         public Command PasswordPromptHelpCommand { get; set; }
-        public AsyncCommand CopyCommand { get; set; }
         public string CipherId { get; set; }
         public string OrganizationId { get; set; }
         public string FolderId { get; set; }
@@ -306,8 +300,7 @@ namespace Bit.App.Pages
         public bool AllowPersonal { get; set; }
         public bool PasswordPrompt => Cipher.Reprompt != CipherRepromptType.None;
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
-        public bool HasTotpValue => IsLogin && !string.IsNullOrEmpty(Cipher?.Login?.Totp);
-        public string SetupTotpText => $"{BitwardenIcons.Camera} {AppResources.SetupTotp}";
+
         public void Init()
         {
             PageTitle = EditMode && !CloneMode ? AppResources.EditItem : AppResources.AddItem;
@@ -865,19 +858,6 @@ namespace Bit.App.Pages
                 await _platformUtilsService.ShowDialogAsync(AppResources.PasswordSafe);
             }
         }
-
-        private async Task CopyTotpClipboardAsync()
-        {
-            try
-            {
-                await _clipboardService.CopyTextAsync(_cipher.Login.Totp);
-                _platformUtilsService.ShowToast("info", null, string.Format(AppResources.ValueHasBeenCopied, AppResources.AuthenticatorKeyScanner));
-            }
-            catch (Exception ex)
-            {
-                _logger.Exception(ex);
-            }
-        }
     }
 
     public class AddEditPageFieldViewModel : ExtendedViewModel

src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml

@@ -6,7 +6,6 @@
     xmlns:u="clr-namespace:Bit.App.Utilities"
     xmlns:effects="clr-namespace:Bit.App.Effects"
     xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
     xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
     x:DataType="pages:GroupingsPageViewModel"
     Title="{Binding PageTitle}"
@@ -54,14 +53,6 @@
                     WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}" />
             </DataTemplate>
 
-            <DataTemplate x:Key="authenticatorTemplate"
-                          x:DataType="pages:GroupingsPageTOTPListItem">
-                <controls:AuthenticatorViewCell 
-                    Cipher="{Binding Cipher}"
-                    WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}"
-                    TotpSec="{Binding TotpSec}"/>
-            </DataTemplate>
-
             <DataTemplate x:Key="groupTemplate"
                           x:DataType="pages:GroupingsPageListItem">
                 <controls:ExtendedStackLayout Orientation="Horizontal" 
@@ -113,7 +104,6 @@
             <pages:GroupingsPageListItemSelector x:Key="listItemDataTemplateSelector"
                                                  HeaderTemplate="{StaticResource headerTemplate}"
                                                  CipherTemplate="{StaticResource cipherTemplate}"
-                                                 AuthenticatorTemplate="{StaticResource authenticatorTemplate}"
                                                  GroupTemplate="{StaticResource groupTemplate}" />
 
             <StackLayout x:Key="mainLayout" x:Name="_mainLayout">
@@ -141,29 +131,6 @@
                         AutomationProperties.Name="{u:I18n Filter}" />
                 </StackLayout>
 
-                <StackLayout
-                    IsVisible="{Binding ShowTotpFilter}"
-                    Orientation="Horizontal"
-                    Margin="0,5,10,0">
-                    <Label
-                        Text="{u:I18n DisplayItemsContainingTOTP}"
-                        LineBreakMode="TailTruncation"
-                        Margin="10,0"
-                        StyleClass="text-md, text-muted"
-                        VerticalOptions="Center"
-                        HorizontalOptions="StartAndExpand" />
-                    <Switch
-                        IsToggled="{Binding TotpFilterEnable}"
-                        StyleClass="box-value"
-                        HorizontalOptions="End">
-                        <Switch.Behaviors>
-                            <xct:EventToCommandBehavior
-                                EventName="Toggled"
-                                Command="{Binding TotpFilterCommand}" />
-                        </Switch.Behaviors>
-                    </Switch>
-                </StackLayout>
-
                 <StackLayout
                     VerticalOptions="CenterAndExpand"
                     Padding="20, 0"

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

@@ -189,11 +189,10 @@ namespace Bit.App.Pages
             return false;
         }
 
-        protected override async void OnDisappearing()
+        protected override void OnDisappearing()
         {
             base.OnDisappearing();
             IsBusy = false;
-            _vm.StopCiphersTotpTick();
             _broadcasterService.Unsubscribe(_pageName);
             _vm.DisableRefreshing();
             _accountAvatar?.OnDisappearing();
@@ -206,13 +205,6 @@ namespace Bit.App.Pages
             {
                 return;
             }
-
-            if (e.CurrentSelection?.FirstOrDefault() is GroupingsPageTOTPListItem totpItem)
-            {
-                await _vm.SelectCipherAsync(totpItem.Cipher);
-                return;
-            }
-
             if (!(e.CurrentSelection?.FirstOrDefault() is GroupingsPageListItem item))
             {
                 return;

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

@@ -2,13 +2,13 @@
 
 namespace Bit.App.Pages
 {
-    public class GroupingsPageListGroup : List<IGroupingsPageListItem>
+    public class GroupingsPageListGroup : List<GroupingsPageListItem>
     {
         public GroupingsPageListGroup(string name, int count, bool doUpper = true, bool first = false)
-            : this(new List<IGroupingsPageListItem>(), name, count, doUpper, first)
+            : this(new List<GroupingsPageListItem>(), name, count, doUpper, first)
         { }
 
-        public GroupingsPageListGroup(IEnumerable<IGroupingsPageListItem> groupItems, string name, int count,
+        public GroupingsPageListGroup(List<GroupingsPageListItem> groupItems, string name, int count,
             bool doUpper = true, bool first = false)
         {
             AddRange(groupItems);

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

@@ -7,7 +7,6 @@ namespace Bit.App.Pages
         public DataTemplate HeaderTemplate { get; set; }
         public DataTemplate CipherTemplate { get; set; }
         public DataTemplate GroupTemplate { get; set; }
-        public DataTemplate AuthenticatorTemplate { get; set; }
 
         protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
         {
@@ -16,16 +15,10 @@ namespace Bit.App.Pages
                 return HeaderTemplate;
             }
 
-            if (item is GroupingsPageTOTPListItem)
-            {
-                return AuthenticatorTemplate;
-            }
-
             if (item is GroupingsPageListItem listItem)
             {
                 return listItem.Cipher != null ? CipherTemplate : GroupTemplate;
             }
-
             return null;
         }
     }

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

@@ -1,123 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class GroupingsPageTOTPListItem : ExtendedViewModel, IGroupingsPageListItem
-    {
-        private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
-        private readonly ITotpService _totpService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IClipboardService _clipboardService;
-        private CipherView _cipher;
-
-        private bool _websiteIconsEnabled;
-        private string _iconImageSource = string.Empty;
-
-        public int interval { get; set; }
-        private double _progress;
-        private string _totpSec;
-        private string _totpCodeFormatted;
-        private TotpHelper _totpTickHelper;
-
-
-        public GroupingsPageTOTPListItem(CipherView cipherView, bool websiteIconsEnabled)
-        {
-            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
-
-            Cipher = cipherView;
-            WebsiteIconsEnabled = websiteIconsEnabled;
-            interval = _totpService.GetTimeInterval(Cipher.Login.Totp);
-            CopyCommand = new AsyncCommand(CopyToClipboardAsync,
-                 onException: ex => _logger.Value.Exception(ex),
-                 allowsMultipleExecutions: false);
-            _totpTickHelper = new TotpHelper(cipherView);
-        }
-
-        public AsyncCommand CopyCommand { get; set; }
-
-        public CipherView Cipher
-        {
-            get => _cipher;
-            set => SetProperty(ref _cipher, value);
-        }
-
-        public string TotpCodeFormatted
-        {
-            get => _totpCodeFormatted;
-            set => SetProperty(ref _totpCodeFormatted, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(TotpCodeFormattedStart),
-                    nameof(TotpCodeFormattedEnd),
-                });
-        }
-
-        public string TotpSec
-        {
-            get => _totpSec;
-            set => SetProperty(ref _totpSec, value);
-        }
-        public double Progress
-        {
-            get => _progress;
-            set => SetProperty(ref _progress, value);
-        }
-        public bool WebsiteIconsEnabled
-        {
-            get => _websiteIconsEnabled;
-            set => SetProperty(ref _websiteIconsEnabled, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-
-        public string TotpCodeFormattedStart => TotpCodeFormatted?.Split(' ')[0];
-
-        public string TotpCodeFormattedEnd => TotpCodeFormatted?.Split(' ')[1];
-
-        public async Task CopyToClipboardAsync()
-        {
-            await _clipboardService.CopyTextAsync(TotpCodeFormatted);
-            _platformUtilsService.ShowToast("info", null, string.Format(AppResources.ValueHasBeenCopied, AppResources.VerificationCodeTotp));
-        }
-
-        public async Task TotpTickAsync()
-        {
-            await _totpTickHelper.GenerateNewTotpValues();
-            MainThread.BeginInvokeOnMainThread(() =>
-            {
-                TotpSec = _totpTickHelper.TotpSec;
-                Progress = _totpTickHelper.Progress;
-                TotpCodeFormatted = _totpTickHelper.TotpCodeFormatted;
-            });
-        }
-    }
-}

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

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
@@ -31,16 +29,13 @@ namespace Bit.App.Pages
         private bool _showList;
         private bool _websiteIconsEnabled;
         private bool _syncRefreshing;
-        private bool _showTotpFilter;
-        private bool _totpFilterEnable;
         private string _noDataText;
         private List<CipherView> _allCiphers;
         private Dictionary<string, int> _folderCounts = new Dictionary<string, int>();
         private Dictionary<string, int> _collectionCounts = new Dictionary<string, int>();
         private Dictionary<CipherType, int> _typeCounts = new Dictionary<CipherType, int>();
         private int _deletedCount = 0;
-        private CancellationTokenSource _totpTickCts;
-        private Task _totpTickTask;
+
         private readonly ICipherService _cipherService;
         private readonly IFolderService _folderService;
         private readonly ICollectionService _collectionService;
@@ -79,12 +74,6 @@ namespace Bit.App.Pages
                 await LoadAsync();
             });
             CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
-            VaultFilterCommand = new AsyncCommand(VaultFilterOptionsAsync,
-                onException: ex => _logger.Exception(ex),
-                allowsMultipleExecutions: false);
-            TotpFilterCommand = new AsyncCommand(LoadAsync,
-                onException: ex => _logger.Exception(ex),
-                allowsMultipleExecutions: false);
 
             AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
             {
@@ -101,9 +90,6 @@ namespace Bit.App.Pages
         public bool HasCiphers { get; set; }
         public bool HasFolders { get; set; }
         public bool HasCollections { get; set; }
-        public string ShowTotpCodesAccessibilityText => TotpFilterEnable ?
-            AppResources.AuthenticationCodesListIsVisibleActivateToShowCipherList
-            : AppResources.CipherListIsVisibleActivateToShowAuthenticationCodesList;
         public bool ShowNoFolderCipherGroup => NoFolderCiphers != null
                                                && NoFolderCiphers.Count < NoFolderListSize
                                                && (Collections is null || !Collections.Any());
@@ -165,21 +151,12 @@ namespace Bit.App.Pages
             get => _websiteIconsEnabled;
             set => SetProperty(ref _websiteIconsEnabled, value);
         }
-        public bool ShowTotpFilter
-        {
-            get => _showTotpFilter;
-            set => SetProperty(ref _showTotpFilter, value);
-        }
-        public bool TotpFilterEnable
-        {
-            get => _totpFilterEnable;
-            set => SetProperty(ref _totpFilterEnable, value);
-        }
+
         public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
+
         public ObservableRangeCollection<IGroupingsPageListItem> GroupedItems { get; set; }
         public Command RefreshCommand { get; set; }
         public Command<CipherView> CipherOptionsCommand { get; set; }
-        public ICommand TotpFilterCommand { get; }
         public bool LoadedOnce { get; set; }
 
         public async Task LoadAsync()
@@ -211,15 +188,13 @@ namespace Bit.App.Pages
             {
                 PageTitle = ShowVaultFilter ? AppResources.Vaults : AppResources.MyVault;
             }
-            var canAccessPremium = await _stateService.CanAccessPremiumAsync();
+
             _doingLoad = true;
             LoadedOnce = true;
             ShowNoData = false;
             Loading = true;
             ShowList = false;
             ShowAddCipherButton = !Deleted;
-            ShowTotpFilter = Type == CipherType.Login && canAccessPremium;
-
             var groupedItems = new List<GroupingsPageListGroup>();
             var page = Page as GroupingsPage;
 
@@ -299,7 +274,10 @@ namespace Bit.App.Pages
                 }
                 if (Ciphers?.Any() ?? false)
                 {
-                    CreateCipherGroupedItems(groupedItems);
+                    var ciphersListItems = Ciphers.Where(c => c.IsDeleted == Deleted)
+                        .Select(c => new GroupingsPageListItem { Cipher = c }).ToList();
+                    groupedItems.Add(new GroupingsPageListGroup(ciphersListItems, AppResources.Items,
+                        ciphersListItems.Count, uppercaseGroupNames, !MainPage && !groupedItems.Any()));
                 }
                 if (ShowNoFolderCipherGroup)
                 {
@@ -387,44 +365,6 @@ namespace Bit.App.Pages
             }
         }
 
-        private void CreateCipherGroupedItems(List<GroupingsPageListGroup> groupedItems)
-        {
-            var uppercaseGroupNames = _deviceActionService.DeviceType == DeviceType.iOS;
-            _totpTickCts?.Cancel();
-            if (TotpFilterEnable)
-            {
-                var ciphersListItems = Ciphers.Where(c => c.IsDeleted == Deleted && !string.IsNullOrEmpty(c.Login.Totp))
-                    .Select(c => new GroupingsPageTOTPListItem(c, true)).ToList();
-                groupedItems.Add(new GroupingsPageListGroup(ciphersListItems, AppResources.Items,
-                    ciphersListItems.Count, uppercaseGroupNames, !MainPage && !groupedItems.Any()));
-
-                StartCiphersTotpTick(ciphersListItems);
-            }
-            else
-            {
-                var ciphersListItems = Ciphers.Where(c => c.IsDeleted == Deleted)
-                    .Select(c => new GroupingsPageListItem { Cipher = c }).ToList();
-                groupedItems.Add(new GroupingsPageListGroup(ciphersListItems, AppResources.Items,
-                    ciphersListItems.Count, uppercaseGroupNames, !MainPage && !groupedItems.Any()));
-            }
-        }
-
-        private void StartCiphersTotpTick(List<GroupingsPageTOTPListItem> ciphersListItems)
-        {
-            _totpTickCts?.Cancel();
-            _totpTickCts = new CancellationTokenSource();
-            _totpTickTask = new TimerTask(logger, () => ciphersListItems.ForEach(i => i.TotpTickAsync()), _totpTickCts).RunPeriodic();
-        }
-
-        public async Task StopCiphersTotpTick()
-        {
-            _totpTickCts?.Cancel();
-            if (_totpTickTask != null)
-            {
-                await _totpTickTask;
-            }
-        }
-
         public void DisableRefreshing()
         {
             Refreshing = false;

src/App/Pages/Vault/ScanPage.xaml

@@ -1,26 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pages:BaseContentPage
+<?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.ScanPage"
     xmlns:pages="clr-namespace:Bit.App.Pages"
     xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:forms="clr-namespace:SkiaSharp.Views.Forms;assembly=SkiaSharp.Views.Forms"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
     xmlns:zxing="clr-namespace:ZXing.Net.Mobile.Forms;assembly=ZXing.Net.Mobile.Forms"
     x:Name="_page"
-    Title="{Binding ScanQrPageTitle}">
-
-    <ContentPage.BindingContext>
-        <pages:ScanPageViewModel />
-    </ContentPage.BindingContext>
-
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-        </ResourceDictionary>
-    </ContentPage.Resources>
+    Title="{u:I18n ScanQrTitle}">
 
     <ContentPage.ToolbarItems>
         <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
@@ -29,114 +16,67 @@
     <Grid
         VerticalOptions="FillAndExpand"
         HorizontalOptions="FillAndExpand">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+
         <zxing:ZXingScannerView
             x:Name="_zxing"
             HorizontalOptions="FillAndExpand"
             VerticalOptions="FillAndExpand"
             AutomationId="zxingScannerView"
-            IsVisible="{Binding ShowScanner}"
-            Grid.Column="0"
-            Grid.Row="0"
-            Grid.RowSpan="3"
-            OnScanResult="OnScanResult"/>
-        <StackLayout
-            VerticalOptions="Center"
+            OnScanResult="OnScanResult">
+        </zxing:ZXingScannerView>
+
+        <Grid
+            VerticalOptions="FillAndExpand"
             HorizontalOptions="FillAndExpand"
-            IsVisible="{Binding ShowScanner}"
-            Grid.Column="0"
-            Grid.Row="0"
-            Grid.RowSpan="2"
-            Margin="30,0">
+            AutomationId="zxingDefaultOverlay">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
 
-            <forms:SKCanvasView
-                x:Name="SkCanvasView" 
-                Margin="0,50,0,0"
-                WidthRequest="250"
-                HeightRequest="250"
-                IsVisible="{Binding ShowScanner}"
-                VerticalOptions="Center" 
-                HorizontalOptions="Center"
-                PaintSurface="OnCanvasViewPaintSurface"/>
-
-            <controls:IconButton 
-                x:Name="_checkIcon"
-                IsVisible="{Binding ShowScanner}"
-                StyleClass="box-row-button, box-row-button-platform"
-                Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
-                HorizontalOptions="Center"
-                VerticalOptions="Start"
-                FontSize="Title"
-                TextColor="Transparent"/>
-        </StackLayout>
-        <BoxView
-            Grid.Column="0"
-            Grid.Row="0"
-            Grid.RowSpan="2"
-            IsVisible="{Binding ShowScanner, Converter={StaticResource inverseBool}}"
-            BackgroundColor="{DynamicResource BackgroundColor}"/>
-        <StackLayout
-                VerticalOptions="Center"
-                HorizontalOptions="FillAndExpand"
-                IsVisible="{Binding ShowScanner, Converter={StaticResource inverseBool}}"
+            <BoxView
                 Grid.Column="0"
                 Grid.Row="0"
-                Grid.RowSpan="2"
-                Margin="30,0">
+                VerticalOptions="Fill"
+                HorizontalOptions="FillAndExpand"
+                BackgroundColor="Black"
+                Opacity="0.7" />
+
             <Label
-                    Text="{u:I18n EnterKeyManually}"
-                    FontSize="Title" />
-            <Label
-                    Text="{u:I18n AuthenticatorKeyScanner}"
-                    StyleClass="box-label" />
-            <controls:MonoEntry
-                    x:Name="_authenticationKeyEntry"
-                    Text="{Binding TotpAuthenticationKey}"
-                    IsSpellCheckEnabled="False"
-                    IsTextPredictionEnabled="False"
-                    StyleClass="box-value" />
-            <Button 
-                    Text="{u:I18n AddTotp}" 
-                    StyleClass="box-button-row"
-                    Clicked="AddAuthenticationKey_OnClicked"/>
-        </StackLayout>
-        <BoxView
+                Text="{u:I18n CameraInstructionTop}"
+                AutomationId="zxingDefaultOverlay_TopTextLabel"
+                Grid.Column="0"
+                Grid.Row="0"
+                VerticalOptions="Center"
+                HorizontalOptions="Center"
+                TextColor="White" />
+
+            <BoxView
+                Grid.Column="0"
+                Grid.Row="1"
+                VerticalOptions="Fill"
+                HorizontalOptions="FillAndExpand"
+                BackgroundColor="Transparent" />
+
+            <BoxView
                 Grid.Column="0"
                 Grid.Row="2"
                 VerticalOptions="Fill"
                 HorizontalOptions="FillAndExpand"
                 BackgroundColor="Black"
                 Opacity="0.7" />
-        <StackLayout
-                VerticalOptions="Start"
-                HorizontalOptions="Center"
-                Grid.Column="0"
-                Grid.Row="2">
+
             <Label
-                    Text="{Binding CameraInstructionTop}"
-                    AutomationId="zxingDefaultOverlay_TopTextLabel"
-                    Margin="30,15,30,0"
-                    HorizontalOptions="Center"
-                    HorizontalTextAlignment="Center"
-                    StyleClass="text-sm"
-                    TextColor="White" />
-        </StackLayout>
-        <Label
-                FormattedText="{Binding ToggleScanModeLabel}"
+                Text="{u:I18n CameraInstructionBottom}"
+                AutomationId="zxingDefaultOverlay_BottomTextLabel"
                 Grid.Column="0"
                 Grid.Row="2"
-                Margin="0,15"
-                StyleClass="text-sm"
-                FontAttributes="Bold"
-                VerticalOptions="End"
-                HorizontalOptions="Center" >
-            <Label.GestureRecognizers>
-                <TapGestureRecognizer Tapped="ToggleScanMode_OnTapped" />
-            </Label.GestureRecognizers>
-        </Label>
+                VerticalOptions="Center"
+                HorizontalOptions="Center"
+                TextColor="White" />
+        </Grid>
+
     </Grid>
-</pages:BaseContentPage>
+
+</pages:BaseContentPage>

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

@@ -1,31 +1,19 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using SkiaSharp;
-using SkiaSharp.Views.Forms;
-using Xamarin.Essentials;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
     public partial class ScanPage : BaseContentPage
     {
-        private ScanPageViewModel ViewModel => BindingContext as ScanPageViewModel;
         private readonly Action<string> _callback;
+
         private CancellationTokenSource _autofocusCts;
         private Task _continuousAutofocusTask;
-        private readonly Color _greenColor;
-        private readonly SKColor _blueSKColor;
-        private readonly SKColor _greenSKColor;
-        private readonly Stopwatch _stopwatch;
-        private bool _pageIsActive;
-        private bool _qrcodeFound;
-        private float _scale;
 
         private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
@@ -44,12 +32,6 @@ namespace Bit.App.Pages
             {
                 ToolbarItems.RemoveAt(0);
             }
-
-            _greenColor = ThemeManager.GetResourceColor("SuccessColor");
-            _greenSKColor = _greenColor.ToSKColor();
-            _blueSKColor = ThemeManager.GetResourceColor("PrimaryColor").ToSKColor();
-            _stopwatch = new Stopwatch();
-            _qrcodeFound = false;
         }
 
         protected override void OnAppearing()
@@ -76,14 +58,7 @@ namespace Bit.App.Pages
                         {
                             if (!autofocusCts.IsCancellationRequested)
                             {
-                                try
-                                {
-                                    _zxing.AutoFocus();
-                                }
-                                catch (Exception ex)
-                                {
-                                    _logger.Value.Exception(ex);
-                                }
+                                _zxing.AutoFocus();
                             }
                         });
                     }
@@ -94,83 +69,27 @@ namespace Bit.App.Pages
                     _logger.Value.Exception(ex);
                 }
             }, autofocusCts.Token);
-            _pageIsActive = true;
-            AnimationLoopAsync();
         }
 
         protected override async void OnDisappearing()
         {
             _autofocusCts?.Cancel();
+
             if (_continuousAutofocusTask != null)
             {
                 await _continuousAutofocusTask;
             }
             _zxing.IsScanning = false;
-            _pageIsActive = false;
+
             base.OnDisappearing();
         }
 
-        private async void OnScanResult(ZXing.Result result)
+        private void OnScanResult(ZXing.Result result)
         {
-            try
-            {
-                // Stop analysis until we navigate away so we don't keep reading barcodes
-                _zxing.IsAnalyzing = false;
-                var text = result?.Text;
-                if (!string.IsNullOrWhiteSpace(text))
-                {
-                    if (text.StartsWith("otpauth://totp"))
-                    {
-                        await QrCodeFoundAsync();
-                        _callback(text);
-                        return;
-                    }
-                    else if (Uri.TryCreate(text, UriKind.Absolute, out Uri uri) &&
-                        !string.IsNullOrWhiteSpace(uri?.Query))
-                    {
-                        var queryParts = uri.Query.Substring(1).ToLowerInvariant().Split('&');
-                        foreach (var part in queryParts)
-                        {
-                            if (part.StartsWith("secret="))
-                            {
-                                await QrCodeFoundAsync();
-                                var subResult = part.Substring(7);
-                                if (!string.IsNullOrEmpty(subResult))
-                                {
-                                    _callback(subResult.ToUpperInvariant());
-                                }
-                                return;
-                            }
-                        }
-                    }
-                }
-                _callback(null);
-            }
-            catch (Exception ex)
-            {
-                _logger?.Value?.Exception(ex);
-            }
-        }
-
-        private async Task QrCodeFoundAsync()
-        {
-            _qrcodeFound = true;
-            Vibration.Vibrate();
-            await Task.Delay(1000);
+            // Stop analysis until we navigate away so we don't keep reading barcodes
+            _zxing.IsAnalyzing = false;
             _zxing.IsScanning = false;
-        }
-
-        private async void Close_Clicked(object sender, System.EventArgs e)
-        {
-            if (DoOnce())
-            {
-                await Navigation.PopModalAsync();
-            }
-        }
-
-        private void AddAuthenticationKey_OnClicked(object sender, EventArgs e)
-        {
-            var text = ViewModel.TotpAuthenticationKey;
+            var text = result?.Text;
             if (!string.IsNullOrWhiteSpace(text))
             {
                 if (text.StartsWith("otpauth://totp"))
@@ -179,7 +98,7 @@ namespace Bit.App.Pages
                     return;
                 }
                 else if (Uri.TryCreate(text, UriKind.Absolute, out Uri uri) &&
-                         !string.IsNullOrWhiteSpace(uri?.Query))
+                    !string.IsNullOrWhiteSpace(uri?.Query))
                 {
                     var queryParts = uri.Query.Substring(1).ToLowerInvariant().Split('&');
                     foreach (var part in queryParts)
@@ -195,77 +114,11 @@ namespace Bit.App.Pages
             _callback(null);
         }
 
-        private void ToggleScanMode_OnTapped(object sender, EventArgs e)
+        private async void Close_Clicked(object sender, System.EventArgs e)
         {
-            ViewModel.ToggleScanModeCommand.Execute(null);
-            if (!ViewModel.ShowScanner)
+            if (DoOnce())
             {
-                _authenticationKeyEntry.Focus();
-            }
-        }
-
-        private void OnCanvasViewPaintSurface(object sender, SKPaintSurfaceEventArgs args)
-        {
-            var info = args.Info;
-            var surface = args.Surface;
-            var canvas = surface.Canvas;
-            var margins = 20;
-            var maxSquareSize = (Math.Min(info.Height, info.Width) * 0.9f - margins) * _scale;
-            var squareSize = maxSquareSize;
-            var lineSize = squareSize * 0.15f;
-            var startXPoint = (info.Width / 2) - (squareSize / 2);
-            var startYPoint = (info.Height / 2) - (squareSize / 2);
-            canvas.Clear(SKColors.Transparent);
-
-            using (var strokePaint = new SKPaint
-            {
-                Color = _qrcodeFound ? _greenSKColor : _blueSKColor,
-                StrokeWidth = 9 * _scale,
-                StrokeCap = SKStrokeCap.Round,
-            })
-            {
-                canvas.Scale(1, 1);
-                //top left
-                canvas.DrawLine(startXPoint, startYPoint, startXPoint, startYPoint + lineSize, strokePaint);
-                canvas.DrawLine(startXPoint, startYPoint, startXPoint + lineSize, startYPoint, strokePaint);
-                //bot left
-                canvas.DrawLine(startXPoint, startYPoint + squareSize, startXPoint, startYPoint + squareSize - lineSize, strokePaint);
-                canvas.DrawLine(startXPoint, startYPoint + squareSize, startXPoint + lineSize, startYPoint + squareSize, strokePaint);
-                //top right
-                canvas.DrawLine(startXPoint + squareSize, startYPoint, startXPoint + squareSize - lineSize, startYPoint, strokePaint);
-                canvas.DrawLine(startXPoint + squareSize, startYPoint, startXPoint + squareSize, startYPoint + lineSize, strokePaint);
-                //bot right
-                canvas.DrawLine(startXPoint + squareSize, startYPoint + squareSize, startXPoint + squareSize - lineSize, startYPoint + squareSize, strokePaint);
-                canvas.DrawLine(startXPoint + squareSize, startYPoint + squareSize, startXPoint + squareSize, startYPoint + squareSize - lineSize, strokePaint);
-            }
-        }
-
-        async Task AnimationLoopAsync()
-        {
-            try
-            {
-                _stopwatch.Start();
-                while (_pageIsActive)
-                {
-                    var t = _stopwatch.Elapsed.TotalSeconds % 2 / 2;
-                    _scale = (20 - (1 - (float)Math.Sin(4 * Math.PI * t))) / 20;
-                    SkCanvasView.InvalidateSurface();
-                    await Task.Delay(TimeSpan.FromSeconds(1.0 / 30));
-                    if (_qrcodeFound && _scale > 0.98f)
-                    {
-                        _checkIcon.TextColor = _greenColor;
-                        SkCanvasView.InvalidateSurface();
-                        break;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger?.Value?.Exception(ex);
-            }
-            finally
-            {
-                _stopwatch?.Stop();
+                await Navigation.PopModalAsync();
             }
         }
     }

src/App/Pages/Vault/ScanPageViewModel.cs

@@ -1,61 +0,0 @@
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core.Abstractions;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class ScanPageViewModel : BaseViewModel
-    {
-        private bool _showScanner = true;
-        private string _totpAuthenticationKey;
-
-        public ScanPageViewModel()
-        {
-            ToggleScanModeCommand = new Command(() => ShowScanner = !ShowScanner);
-        }
-
-        public Command ToggleScanModeCommand { get; set; }
-        public string ScanQrPageTitle => ShowScanner ? AppResources.ScanQrTitle : AppResources.AuthenticatorKeyScanner;
-        public string CameraInstructionTop => ShowScanner ? AppResources.PointYourCameraAtTheQRCode : AppResources.OnceTheKeyIsSuccessfullyEntered;
-        public string TotpAuthenticationKey
-        {
-            get => _totpAuthenticationKey;
-            set => SetProperty(ref _totpAuthenticationKey, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(ToggleScanModeLabel)
-                });
-        }
-        public bool ShowScanner
-        {
-            get => _showScanner;
-            set => SetProperty(ref _showScanner, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(ToggleScanModeLabel),
-                    nameof(ScanQrPageTitle),
-                    nameof(CameraInstructionTop)
-                });
-        }
-
-        public FormattedString ToggleScanModeLabel
-        {
-            get
-            {
-                var fs = new FormattedString();
-                fs.Spans.Add(new Span
-                {
-                    Text = ShowScanner ? AppResources.CannotScanQRCode : AppResources.CannotAddAuthenticatorKey,
-                    TextColor = ThemeManager.GetResourceColor("TitleTextColor")
-                });
-                fs.Spans.Add(new Span
-                {
-                    Text = ShowScanner ? AppResources.EnterKeyManually : AppResources.ScanQRCode,
-                    TextColor = ThemeManager.GetResourceColor("ScanningToggleModeTextColor")
-                });
-                return fs;
-            }
-        }
-    }
-}

src/App/Pages/Vault/ViewPage.xaml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pages:BaseContentPage
+<?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.ViewPage"
@@ -22,15 +22,15 @@
             <u:StringHasValueConverter x:Key="stringHasValue" />
             <u:IsNotNullConverter x:Key="notNull" />
             <ToolbarItem Text="{u:I18n Collections}"
-                         x:Key="collectionsItem"
-                         x:Name="_collectionsItem"
-                         Clicked="Collections_Clicked"
-                         Order="Secondary" />
+                     x:Key="collectionsItem"
+                     x:Name="_collectionsItem"
+                     Clicked="Collections_Clicked"
+                     Order="Secondary" />
             <ToolbarItem Text="{u:I18n MoveToOrganization}"
-                         x:Key="shareItem"
-                         x:Name="_shareItem"
-                         Clicked="Share_Clicked"
-                         Order="Secondary" />
+                     x:Key="shareItem"
+                     x:Name="_shareItem"
+                     Clicked="Share_Clicked"
+                     Order="Secondary" />
             <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
                          x:Name="_closeItem" x:Key="closeItem" />
             <ToolbarItem Clicked="EditToolbarItem_Clicked" Order="Primary"
@@ -83,7 +83,7 @@
                                     StyleClass="box-value"
                                     Grid.Row="1"
                                     Grid.Column="0" />
-                                <controls:IconButton
+                                <controls:IconButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                                     Command="{Binding CopyCommand}"
@@ -96,7 +96,7 @@
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Login.Username, Converter={StaticResource stringHasValue}}" />
-                            <Grid StyleClass="box-row"
+                            <Grid StyleClass="box-row" 
                                   IsVisible="{Binding Cipher.Login.Password, Converter={StaticResource stringHasValue}}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
@@ -126,7 +126,7 @@
                                     Grid.Column="0"
                                     LineBreakMode="CharacterWrap"
                                     IsVisible="{Binding ShowPassword}" />
-                                <controls:IconButton
+                                <controls:IconButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
                                     Command="{Binding CheckPasswordCommand}"
@@ -136,7 +136,7 @@
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n CheckPassword}"
                                     IsVisible="{Binding Cipher.ViewPassword}" />
-                                <controls:IconButton
+                                <controls:IconButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowPasswordIcon}"
                                     Command="{Binding TogglePasswordCommand}"
@@ -147,7 +147,7 @@
                                     AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                     AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
                                     IsVisible="{Binding Cipher.ViewPassword}" />
-                                <controls:IconButton
+                                <controls:IconButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                                     Command="{Binding CopyCommand}"
@@ -165,11 +165,10 @@
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
-                                    <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="40" />
+                                    <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
                                 <Label
@@ -179,49 +178,29 @@
                                     Grid.Column="0" />
                                 <controls:MonoLabel
                                     Text="{Binding TotpCodeFormatted, Mode=OneWay}"
-                                    IsVisible="{Binding ShowUpgradePremiumTotpText, Converter={StaticResource inverseBool}}"
                                     StyleClass="box-value"
                                     Grid.Row="1"
-                                    Grid.Column="0"
-                                    VerticalTextAlignment="Start"
-                                    VerticalOptions="Start" />
-                                <controls:CircularProgressbarView
-                                    Progress="{Binding TotpProgress}"
-                                    Grid.Row="0"
-                                    Grid.Column="1"
-                                    Grid.RowSpan="2"
-                                    HorizontalOptions="FillAndExpand"
-                                    VerticalOptions="FillAndExpand" />
+                                    Grid.Column="0" />
                                 <Label
                                     Text="{Binding TotpSec, Mode=OneWay}"
                                     Style="{DynamicResource textTotp}"
+                                    Margin="0, 0, 10, 0"
                                     Grid.Row="0"
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
-                                    StyleClass="text-sm"
-                                    VerticalTextAlignment="Center"
-                                    HorizontalTextAlignment="Center"
-                                    HorizontalOptions="FillAndExpand"
-                                    VerticalOptions="FillAndExpand" />
-                                <controls:IconButton
+                                    HorizontalOptions="End"
+                                    HorizontalTextAlignment="End"
+                                    VerticalOptions="CenterAndExpand" />
+                                <controls:IconButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                                     Command="{Binding CopyCommand}"
-                                    IsVisible="{Binding CanAccessPremium}"
                                     CommandParameter="LoginTotp"
                                     Grid.Row="0"
                                     Grid.Column="2"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n CopyTotp}" />
-                                <Label
-                                    Text="{u:I18n PremiumSubscriptionRequired}"
-                                    StyleClass="box-footer-label"
-                                    IsVisible="{Binding ShowUpgradePremiumTotpText}"
-                                    Margin="0,5,0,2"
-                                    Grid.Column="0"
-                                    Grid.Row="1"
-                                    HorizontalOptions="FillAndExpand" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator" IsVisible="{Binding ShowTotp}" />
                         </StackLayout>
@@ -265,7 +244,7 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     IsVisible="{Binding ShowCardNumber}" />
-                                <controls:IconButton
+                                <controls:IconButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowCardNumberIcon}"
                                     Command="{Binding ToggleCardNumberCommand}"
@@ -274,7 +253,7 @@
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                                <controls:IconButton
+                                <controls:IconButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                                     Command="{Binding CopyCommand}"
@@ -337,7 +316,7 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     IsVisible="{Binding ShowCardCode}" />
-                                <controls:IconButton
+                                <controls:IconButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowCardCodeIcon}"
                                     Command="{Binding ToggleCardCodeCommand}"
@@ -346,7 +325,7 @@
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                                <controls:IconButton
+                                <controls:IconButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                                     Command="{Binding CopyCommand}"
@@ -550,7 +529,7 @@
                         <StackLayout StyleClass="box-row">
                             <controls:SelectableLabel
                                 Text="{Binding Cipher.Notes, Mode=OneWay}"
-                                StyleClass="box-value" />
+                                StyleClass="box-value"/>
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                     </StackLayout>
@@ -609,7 +588,7 @@
                                                     StyleClass="box-value"
                                                     IsVisible="{Binding ShowHiddenValue, Converter={StaticResource inverseBool}}" />
                                             </StackLayout>
-                                            <controls:IconButton
+                                            <controls:IconButton 
                                                 StyleClass="box-row-button, box-row-button-platform"
                                                 Text="{Binding ShowHiddenValueIcon}"
                                                 Command="{Binding ToggleHiddenValueCommand}"
@@ -657,7 +636,7 @@
                                                 StyleClass="box-sub-label"
                                                 HorizontalTextAlignment="End"
                                                 VerticalTextAlignment="Center" />
-                                            <controls:IconButton
+                                            <controls:IconButton 
                                                 StyleClass="box-row-button, box-row-button-platform"
                                                 Text="{Binding Source={x:Static core:BitwardenIcons.Download}}"
                                                 Command="{Binding BindingContext.DownloadAttachmentCommand, Source={x:Reference _page}}"
@@ -721,4 +700,4 @@
         </Button>
     </AbsoluteLayout>
 
-</pages:BaseContentPage>
+</pages:BaseContentPage>

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

@@ -112,7 +112,7 @@ namespace Bit.App.Pages
             base.OnDisappearing();
             IsBusy = false;
             _broadcasterService.Unsubscribe(nameof(ViewPage));
-            _vm.StopCiphersTotpTick();
+            _vm.CleanUp();
         }
 
         private async void PasswordHistory_Tapped(object sender, System.EventArgs e)

src/App/Pages/Vault/ViewPageViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Abstractions;
@@ -23,6 +22,7 @@ namespace Bit.App.Pages
         private readonly IDeviceActionService _deviceActionService;
         private readonly ICipherService _cipherService;
         private readonly IStateService _stateService;
+        private readonly ITotpService _totpService;
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IAuditService _auditService;
         private readonly IMessagingService _messagingService;
@@ -47,15 +47,13 @@ namespace Bit.App.Pages
         private byte[] _attachmentData;
         private string _attachmentFilename;
         private bool _passwordReprompted;
-        private TotpHelper _totpTickHelper;
-        private CancellationTokenSource _totpTickCancellationToken;
-        private Task _totpTickTask;
 
         public ViewPageViewModel()
         {
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _auditService = ServiceContainer.Resolve<IAuditService>("auditService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
@@ -108,7 +106,6 @@ namespace Bit.App.Pages
                     nameof(ShowIdentityAddress),
                     nameof(IsDeleted),
                     nameof(CanEdit),
-                    nameof(ShowUpgradePremiumTotpText)
                 });
         }
         public List<ViewPageFieldViewModel> Fields
@@ -210,22 +207,21 @@ namespace Bit.App.Pages
                 return fs;
             }
         }
-
-        public bool ShowUpgradePremiumTotpText => !CanAccessPremium && ShowTotp;
         public bool ShowUris => IsLogin && Cipher.Login.HasUris;
         public bool ShowIdentityAddress => IsIdentity && (
             !string.IsNullOrWhiteSpace(Cipher.Identity.Address1) ||
             !string.IsNullOrWhiteSpace(Cipher.Identity.City) ||
             !string.IsNullOrWhiteSpace(Cipher.Identity.Country));
         public bool ShowAttachments => Cipher.HasAttachments && (CanAccessPremium || Cipher.OrganizationId != null);
-        public bool ShowTotp => IsLogin && !string.IsNullOrWhiteSpace(Cipher.Login.Totp);
+        public bool ShowTotp => IsLogin && !string.IsNullOrWhiteSpace(Cipher.Login.Totp) &&
+            !string.IsNullOrWhiteSpace(TotpCodeFormatted);
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
         public string ShowCardNumberIcon => ShowCardNumber ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
         public string ShowCardCodeIcon => ShowCardCode ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string TotpCodeFormatted
         {
-            get => _canAccessPremium ? _totpCodeFormatted : string.Empty;
+            get => _totpCodeFormatted;
             set => SetProperty(ref _totpCodeFormatted, value,
                 additionalPropertyNames: new string[]
                 {
@@ -235,11 +231,7 @@ namespace Bit.App.Pages
         public string TotpSec
         {
             get => _totpSec;
-            set => SetProperty(ref _totpSec, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(TotpProgress)
-                });
+            set => SetProperty(ref _totpSec, value);
         }
         public bool TotpLow
         {
@@ -250,12 +242,12 @@ namespace Bit.App.Pages
                 Page.Resources["textTotp"] = ThemeManager.Resources()[value ? "text-danger" : "text-default"];
             }
         }
-        public double TotpProgress => string.IsNullOrEmpty(TotpSec) ? 0 : double.Parse(TotpSec) * 100 / 30;
         public bool IsDeleted => Cipher.IsDeleted;
         public bool CanEdit => !Cipher.IsDeleted;
 
         public async Task<bool> LoadAsync(Action finishedLoadingAction = null)
         {
+            CleanUp();
             var cipher = await _cipherService.GetAsync(CipherId);
             if (cipher == null)
             {
@@ -269,10 +261,19 @@ namespace Bit.App.Pages
             if (Cipher.Type == Core.Enums.CipherType.Login && !string.IsNullOrWhiteSpace(Cipher.Login.Totp) &&
                 (Cipher.OrganizationUseTotp || CanAccessPremium))
             {
-                _totpTickHelper = new TotpHelper(Cipher);
-                _totpTickCancellationToken?.Cancel();
-                _totpTickCancellationToken = new CancellationTokenSource();
-                _totpTickTask = new TimerTask(_logger, StartCiphersTotpTick, _totpTickCancellationToken).RunPeriodic();
+                await TotpUpdateCodeAsync();
+                var interval = _totpService.GetTimeInterval(Cipher.Login.Totp);
+                await TotpTickAsync(interval);
+                _totpInterval = DateTime.UtcNow;
+                Device.StartTimer(new TimeSpan(0, 0, 1), () =>
+                {
+                    if (_totpInterval == null)
+                    {
+                        return false;
+                    }
+                    var task = TotpTickAsync(interval);
+                    return true;
+                });
             }
             if (_previousCipherId != CipherId)
             {
@@ -283,27 +284,9 @@ namespace Bit.App.Pages
             return true;
         }
 
-        private async void StartCiphersTotpTick()
+        public void CleanUp()
         {
-            try
-            {
-                await _totpTickHelper.GenerateNewTotpValues();
-                TotpSec = _totpTickHelper.TotpSec;
-                TotpCodeFormatted = _totpTickHelper.TotpCodeFormatted;
-            }
-            catch (Exception ex)
-            {
-                _logger.Exception(ex);
-            }
-        }
-
-        public async Task StopCiphersTotpTick()
-        {
-            _totpTickCancellationToken?.Cancel();
-            if (_totpTickTask != null)
-            {
-                await _totpTickTask;
-            }
+            _totpInterval = null;
         }
 
         public async void TogglePassword()
@@ -431,6 +414,47 @@ namespace Bit.App.Pages
             return false;
         }
 
+        private async Task TotpUpdateCodeAsync()
+        {
+            if (Cipher == null || Cipher.Type != Core.Enums.CipherType.Login || Cipher.Login.Totp == null)
+            {
+                _totpInterval = null;
+                return;
+            }
+            _totpCode = await _totpService.GetCodeAsync(Cipher.Login.Totp);
+            if (_totpCode != null)
+            {
+                if (_totpCode.Length > 4)
+                {
+                    var half = (int)Math.Floor(_totpCode.Length / 2M);
+                    TotpCodeFormatted = string.Format("{0} {1}", _totpCode.Substring(0, half),
+                        _totpCode.Substring(half));
+                }
+                else
+                {
+                    TotpCodeFormatted = _totpCode;
+                }
+            }
+            else
+            {
+                TotpCodeFormatted = null;
+                _totpInterval = null;
+            }
+        }
+
+        private async Task TotpTickAsync(int intervalSeconds)
+        {
+            var epoc = CoreHelpers.EpocUtcNow() / 1000;
+            var mod = epoc % intervalSeconds;
+            var totpSec = intervalSeconds - mod;
+            TotpSec = totpSec.ToString();
+            TotpLow = totpSec < 7;
+            if (mod == 0)
+            {
+                await TotpUpdateCodeAsync();
+            }
+        }
+
         private async void CheckPasswordAsync()
         {
             if (!(Page as BaseContentPage).DoOnce())
@@ -616,7 +640,7 @@ namespace Bit.App.Pages
             }
             else if (id == "LoginTotp")
             {
-                text = TotpCodeFormatted.Replace(" ", string.Empty);
+                text = _totpCode;
                 name = AppResources.VerificationCodeTotp;
             }
             else if (id == "LoginUri")

src/App/Resources/AppResources.Designer.cs

@@ -353,12 +353,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string Authenticator {
-            get {
-                return ResourceManager.GetString("Authenticator", resourceCulture);
-            }
-        }
-        
         public static string Name {
             get {
                 return ResourceManager.GetString("Name", resourceCulture);
@@ -1451,9 +1445,15 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string PointYourCameraAtTheQRCode {
+        public static string CameraInstructionBottom {
             get {
-                return ResourceManager.GetString("PointYourCameraAtTheQRCode", resourceCulture);
+                return ResourceManager.GetString("CameraInstructionBottom", resourceCulture);
+            }
+        }
+        
+        public static string CameraInstructionTop {
+            get {
+                return ResourceManager.GetString("CameraInstructionTop", resourceCulture);
             }
         }
         
@@ -4037,90 +4037,12 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string DisplayItemsContainingTOTP {
-            get {
-                return ResourceManager.GetString("DisplayItemsContainingTOTP", resourceCulture);
-            }
-        }
-        
-        public static string PremiumSubscriptionRequired {
-            get {
-                return ResourceManager.GetString("PremiumSubscriptionRequired", resourceCulture);
-            }
-        }
-        
-        public static string CannotAddAuthenticatorKey {
-            get {
-                return ResourceManager.GetString("CannotAddAuthenticatorKey", resourceCulture);
-            }
-        }
-        
-        public static string ScanQRCode {
-            get {
-                return ResourceManager.GetString("ScanQRCode", resourceCulture);
-            }
-        }
-        
-        public static string CannotScanQRCode {
-            get {
-                return ResourceManager.GetString("CannotScanQRCode", resourceCulture);
-            }
-        }
-        
-        public static string AuthenticatorKeyScanner {
-            get {
-                return ResourceManager.GetString("AuthenticatorKeyScanner", resourceCulture);
-            }
-        }
-        
-        public static string EnterKeyManually {
-            get {
-                return ResourceManager.GetString("EnterKeyManually", resourceCulture);
-            }
-        }
-        
-        public static string AddTotp {
-            get {
-                return ResourceManager.GetString("AddTotp", resourceCulture);
-            }
-        }
-        
-        public static string SetupTotp {
-            get {
-                return ResourceManager.GetString("SetupTotp", resourceCulture);
-            }
-        }
-        
-        public static string OnceTheKeyIsSuccessfullyEntered {
-            get {
-                return ResourceManager.GetString("OnceTheKeyIsSuccessfullyEntered", resourceCulture);
-            }
-        }
-        
-        public static string SelectAddTotpToStoreTheKeySafely {
-            get {
-                return ResourceManager.GetString("SelectAddTotpToStoreTheKeySafely", resourceCulture);
-            }
-        }
-        
         public static string NeverLockWarning {
             get {
                 return ResourceManager.GetString("NeverLockWarning", resourceCulture);
             }
         }
         
-        public static string CipherListIsVisibleActivateToShowAuthenticationCodesList {
-            get {
-                return ResourceManager.GetString("CipherListIsVisibleActivateToShowAuthenticationCodesList", resourceCulture);
-            }
-        }
-        
-        public static string AuthenticationCodesListIsVisibleActivateToShowCipherList {
-            get {
-                return ResourceManager.GetString("AuthenticationCodesListIsVisibleActivateToShowCipherList", resourceCulture);
-            }
-        }
-        
         public static string EnvironmentPageUrlsError {
             get {
                 return ResourceManager.GetString("EnvironmentPageUrlsError", resourceCulture);
@@ -4144,5 +4066,83 @@ namespace Bit.App.Resources {
                 return ResourceManager.GetString("AreYouSureYouWantToEnableScreenCapture", resourceCulture);
             }
         }
+        
+        public static string LogInRequested {
+            get {
+                return ResourceManager.GetString("LogInRequested", resourceCulture);
+            }
+        }
+        
+        public static string AreYouTryingToLogIn {
+            get {
+                return ResourceManager.GetString("AreYouTryingToLogIn", resourceCulture);
+            }
+        }
+        
+        public static string LogInAttemptByOn {
+            get {
+                return ResourceManager.GetString("LogInAttemptByOn", resourceCulture);
+            }
+        }
+        
+        public static string DeviceType {
+            get {
+                return ResourceManager.GetString("DeviceType", resourceCulture);
+            }
+        }
+        
+        public static string IpAddress {
+            get {
+                return ResourceManager.GetString("IpAddress", resourceCulture);
+            }
+        }
+        
+        public static string Time {
+            get {
+                return ResourceManager.GetString("Time", resourceCulture);
+            }
+        }
+        
+        public static string Near {
+            get {
+                return ResourceManager.GetString("Near", resourceCulture);
+            }
+        }
+        
+        public static string ConfirmLogIn {
+            get {
+                return ResourceManager.GetString("ConfirmLogIn", resourceCulture);
+            }
+        }
+        
+        public static string DenyLogIn {
+            get {
+                return ResourceManager.GetString("DenyLogIn", resourceCulture);
+            }
+        }
+        
+        public static string JustNow {
+            get {
+                return ResourceManager.GetString("JustNow", resourceCulture);
+            }
+        }
+        
+        public static string MinutesAgo {
+            get {
+                return ResourceManager.GetString("MinutesAgo", resourceCulture);
+            }
+        }
+        
+        public static string LogInAccepted {
+            get {
+                return ResourceManager.GetString("LogInAccepted", resourceCulture);
+            }
+        }
+        
+        public static string LogInDenied {
+            get {
+                return ResourceManager.GetString("LogInDenied", resourceCulture);
+            }
+        }
     }
 }

src/App/Resources/AppResources.resx

@@ -299,10 +299,6 @@
     <value>My Vault</value>
     <comment>The title for the vault page.</comment>
   </data>
-  <data name="Authenticator" xml:space="preserve">
-    <value>Authenticator</value>
-    <comment>Authenticator TOTP feature</comment>
-  </data>
   <data name="Name" xml:space="preserve">
     <value>Name</value>
     <comment>Label for an entity name.</comment>
@@ -893,9 +889,11 @@
   <data name="AuthenticatorKeyReadError" xml:space="preserve">
     <value>Cannot read authenticator key.</value>
   </data>
-  <data name="PointYourCameraAtTheQRCode" xml:space="preserve">
-    <value>Point your camera at the QR Code.
-Scanning will happen automatically.</value>
+  <data name="CameraInstructionBottom" xml:space="preserve">
+    <value>Scanning will happen automatically.</value>
+  </data>
+  <data name="CameraInstructionTop" xml:space="preserve">
+    <value>Point your camera at the QR code.</value>
   </data>
   <data name="ScanQrTitle" xml:space="preserve">
     <value>Scan QR Code</value>
@@ -2256,49 +2254,9 @@ Scanning will happen automatically.</value>
   <data name="All" xml:space="preserve">
     <value>All</value>
   </data>
-  <data name="DisplayItemsContainingTOTP" xml:space="preserve">
-    <value>Display items containing TOTP</value>
-  </data>
-  <data name="PremiumSubscriptionRequired" xml:space="preserve">
-    <value>Premium subscription required</value>
-  </data>
-  <data name="CannotAddAuthenticatorKey" xml:space="preserve">
-    <value>Cannot add authenticator key? </value>
-  </data>
-  <data name="ScanQRCode" xml:space="preserve">
-    <value>Scan QR Code</value>
-  </data>
-  <data name="CannotScanQRCode" xml:space="preserve">
-    <value>Cannot scan QR Code? </value>
-  </data>
-  <data name="AuthenticatorKeyScanner" xml:space="preserve">
-    <value>Authenticator Key</value>
-  </data>
-  <data name="EnterKeyManually" xml:space="preserve">
-    <value>Enter Key Manually</value>
-  </data>
-  <data name="AddTotp" xml:space="preserve">
-    <value>Add TOTP</value>
-  </data>
-  <data name="SetupTotp" xml:space="preserve">
-    <value>Set up 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>
   </data>
-  <data name="CipherListIsVisibleActivateToShowAuthenticationCodesList" xml:space="preserve">
-    <value>Cipher list is visible, activate to show authentication codes list.</value>
-  </data>
-  <data name="AuthenticationCodesListIsVisibleActivateToShowCipherList" xml:space="preserve">
-    <value>Authentication codes list is visible, activate to show cipher list.</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>
   </data>
@@ -2311,4 +2269,46 @@ select Add TOTP to store the key safely</value>
   <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
     <value>Are you sure you want to enable Screen Capture?</value>
   </data>
+  <data name="LogInRequested" xml:space="preserve">
+    <value>Log in requested</value>
+  </data>
+  <data name="AreYouTryingToLogIn" xml:space="preserve">
+    <value>Are you trying to log in?</value>
+  </data>
+  <data name="LogInAttemptByOn" xml:space="preserve">
+    <value>Log in attempt by {0} on {1}</value>
+  </data>
+  <data name="FingerprintPhrase" xml:space="preserve">
+    <value>Fingerprint phrase</value>
+  </data>
+  <data name="DeviceType" xml:space="preserve">
+    <value>Device Type</value>
+  </data>
+  <data name="IpAddress" xml:space="preserve">
+    <value>IP Address</value>
+  </data>
+  <data name="Time" xml:space="preserve">
+    <value>Time</value>
+  </data>
+  <data name="Near" xml:space="preserve">
+    <value>Near</value>
+  </data>
+  <data name="ConfirmLogIn" xml:space="preserve">
+    <value>Confirm Log In</value>
+  </data>
+  <data name="DenyLogIn" xml:space="preserve">
+    <value>Deny Log In</value>
+  </data>
+  <data name="JustNow" xml:space="preserve">
+    <value>Just Now</value>
+  </data>
+  <data name="MinutesAgo" xml:space="preserve">
+    <value>minutes ago</value>
+  </data>
+  <data name="LogInAccepted" xml:space="preserve">
+    <value>Log in accepted</value>
+  </data>
+  <data name="LogInDenied" xml:space="preserve">
+    <value>Log in denied</value>
+  </data>
 </root>

src/App/Styles/Android.xaml

@@ -79,34 +79,9 @@
         <Setter Property="StepperForegroundColor"
                 Value="{DynamicResource StepperForegroundColor}" />
     </Style>
-    <Style TargetType="Frame" 
-           Class="btn-icon-row">
-        <Setter Property="BackgroundColor"
-                Value="{DynamicResource ButtonBackgroundColor}" />
-        <Setter Property="BorderColor"
-                Value="{DynamicResource ButtonBorderColor}" />
-        <Setter Property="CornerRadius"
-                Value="5" />
-        <Setter Property="Margin"
-                Value="0, 5, 0, 0" />
-        <Setter Property="HasShadow"
-                Value="False" />
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="BackgroundColor"
-                                    Value="{DynamicResource ButtonBackgroundColorDisabled}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
     
     <!-- Buttons -->
+    
     <Style TargetType="Button">
         <Setter Property="BackgroundColor"
                 Value="{DynamicResource ButtonBackgroundColor}" />

src/App/Styles/Base.xaml

@@ -505,17 +505,4 @@
             </Keyboard>
         </Setter>
     </Style>
-    
-    <Style TargetType="controls:CircularProgressbarView">
-        <Setter Property="ProgressColor"
-                Value="{DynamicResource PrimaryColor}" />
-        <Setter Property="EndingProgressColor"
-                Value="{DynamicResource DangerColor}" />
-        <Setter Property="BackgroundProgressColor"
-                Value="{DynamicResource BackgroundColor}" />
-        <Setter Property="StrokeWidth"
-                Value="3" />
-        <Setter Property="Radius"
-                Value="15" />
-    </Style>
 </ResourceDictionary>

src/App/Styles/Black.xaml

@@ -71,6 +71,4 @@
     <Color x:Key="NavigationBarTextColor">#ffffff</Color>
     
     <Color x:Key="HyperlinkColor">#52bdfb</Color>
-
-    <Color x:Key="ScanningToggleModeTextColor">#80BDFF</Color>
 </ResourceDictionary>

src/App/Styles/Dark.xaml

@@ -71,6 +71,4 @@
     <Color x:Key="NavigationBarTextColor">#ffffff</Color>
     
     <Color x:Key="HyperlinkColor">#52bdfb</Color>
-    
-    <Color x:Key="ScanningToggleModeTextColor">#80BDFF</Color>
 </ResourceDictionary>

src/App/Styles/Light.xaml

@@ -71,6 +71,4 @@
     <Color x:Key="NavigationBarTextColor">#ffffff</Color>
     
     <Color x:Key="HyperlinkColor">#175DDC</Color>
-
-    <Color x:Key="ScanningToggleModeTextColor">#80BDFF</Color>
 </ResourceDictionary>

src/App/Styles/Nord.xaml

@@ -71,6 +71,4 @@
     <Color x:Key="NavigationBarTextColor">#e5e9f0</Color>
     
     <Color x:Key="HyperlinkColor">#81a1c1</Color>
-
-    <Color x:Key="ScanningToggleModeTextColor">#80BDFF</Color>
 </ResourceDictionary>

src/App/Styles/iOS.xaml

@@ -92,32 +92,6 @@
         <Setter Property="StepperForegroundColor"
                 Value="{DynamicResource StepperForegroundColor}" />
     </Style>
-    <Style TargetType="Frame" 
-           Class="btn-icon-row">
-        <Setter Property="BackgroundColor"
-                Value="{DynamicResource ButtonBackgroundColor}" />
-        <Setter Property="BorderColor"
-                Value="{DynamicResource ButtonBorderColor}" />
-        <Setter Property="CornerRadius"
-                Value="5" />
-        <Setter Property="Margin"
-                Value="0, 10, 0, 0" />
-        <Setter Property="HasShadow"
-                Value="False" />
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="BackgroundColor"
-                                    Value="{DynamicResource ButtonBackgroundColorDisabled}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
 
     <!-- Buttons -->
 

src/App/Utilities/TimerTask.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Abstractions;
-using Xamarin.Forms;
-
-namespace Bit.App.Utilities
-{
-    public class TimerTask
-    {
-        private readonly ILogger _logger;
-        private readonly Action _action;
-        private readonly CancellationTokenSource _cancellationToken;
-
-        public TimerTask(ILogger logger, Action action, CancellationTokenSource cancellationToken)
-        {
-            _logger = logger;
-            _action = action ?? throw new ArgumentNullException();
-            _cancellationToken = cancellationToken;
-        }
-
-        public Task RunPeriodic(TimeSpan? interval = null)
-        {
-            interval = interval ?? TimeSpan.FromSeconds(1);
-            return Task.Run(async () =>
-            {
-                try
-                {
-                    while (!_cancellationToken.IsCancellationRequested)
-                    {
-                        await Device.InvokeOnMainThreadAsync(() =>
-                        {
-                            if (!_cancellationToken.IsCancellationRequested)
-                            {
-                                try
-                                {
-                                    _action();
-                                }
-                                catch (Exception ex)
-                                {
-                                    _logger?.Exception(ex);
-                                }
-                            }
-                        });
-                        await Task.Delay(interval.Value, _cancellationToken.Token);
-                    }
-                }
-                catch (TaskCanceledException) { }
-                catch (Exception ex)
-                {
-                    _logger?.Exception(ex);
-                }
-            }, _cancellationToken.Token);
-        }
-    }
-}

src/App/Utilities/TotpHelper.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Utilities
-{
-    public class TotpHelper
-    {
-        private ITotpService _totpService;
-        private CipherView _cipher;
-        private int _interval;
-
-        public TotpHelper(CipherView cipher)
-        {
-            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
-            _cipher = cipher;
-            _interval = _totpService.GetTimeInterval(cipher?.Login?.Totp);
-        }
-
-        public string TotpSec { get; private set; }
-        public string TotpCodeFormatted { get; private set; }
-        public double Progress { get; private set; }
-
-        public async Task GenerateNewTotpValues()
-        {
-            var epoc = CoreHelpers.EpocUtcNow() / 1000;
-            var mod = epoc % _interval;
-            var totpSec = _interval - mod;
-            TotpSec = totpSec.ToString();
-            Progress = totpSec * 100 / 30;
-            if (mod == 0 || string.IsNullOrEmpty(TotpCodeFormatted))
-            {
-                TotpCodeFormatted = await TotpUpdateCodeAsync();
-            }
-        }
-
-        private async Task<string> TotpUpdateCodeAsync()
-        {
-            var totpCode = await _totpService.GetCodeAsync(_cipher?.Login?.Totp);
-            if (totpCode == null)
-            {
-                return null;
-            }
-
-            if (totpCode.Length <= 4)
-            {
-                return totpCode;
-            }
-
-            var half = (int)Math.Floor(totpCode.Length / 2M);
-            return string.Format("{0} {1}", totpCode.Substring(0, half),
-                totpCode.Substring(half));
-        }
-    }
-}

src/Core/Abstractions/IAuthService.cs

@@ -25,6 +25,11 @@ namespace Bit.Core.Abstractions
         Task<AuthResult> LogInSsoAsync(string code, string codeVerifier, string redirectUrl, string orgId);
         Task<AuthResult> LogInCompleteAsync(string email, string masterPassword, TwoFactorProviderType twoFactorProvider, string twoFactorToken, bool? remember = null);
         Task<AuthResult> LogInTwoFactorAsync(TwoFactorProviderType twoFactorProvider, string twoFactorToken, string captchaToken, bool? remember = null);
+
+        Task<AuthResult> GetLogInPasswordlessRequestsAsync();
+        Task<AuthResult> LogInPasswordlessAcceptAsync();
+        Task<AuthResult> LogInPasswordlessRejectAsync();
+
         void LogOut(Action callback);
         void Init();
     }

src/Core/Services/AuthService.cs

@@ -468,5 +468,9 @@ namespace Bit.Core.Services
             TwoFactorProvidersData = null;
             SelectedTwoFactorProviderType = null;
         }
+
+        public async Task<AuthResult> GetLogInPasswordlessRequestsAsync() => await Task.FromResult<AuthResult>(new AuthResult());
+        public async Task<AuthResult> LogInPasswordlessAcceptAsync() => await Task.FromResult<AuthResult>(new AuthResult());
+        public async Task<AuthResult> LogInPasswordlessRejectAsync() => await Task.FromResult<AuthResult>(new AuthResult());
     }
 }