From a5f960d8a1509e52c0c24d5be561dd796f00247f Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 8 Jul 2019 13:37:45 -0400
Subject: [PATCH] show proper name for faceid. homepage margin on ios

---
 src/App/Pages/Accounts/HomePage.xaml              |  9 ++++++++-
 .../SettingsPage/SettingsPageViewModel.cs         | 15 +++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/App/Pages/Accounts/HomePage.xaml b/src/App/Pages/Accounts/HomePage.xaml
index 3f5ef4e72..3c5c388dc 100644
--- a/src/App/Pages/Accounts/HomePage.xaml
+++ b/src/App/Pages/Accounts/HomePage.xaml
@@ -16,7 +16,14 @@
         <controls:FaButton Text="&#xf013;"
                            StyleClass="btn-muted, btn-icon, btn-icon-platform"
                            HorizontalOptions="Start"
-                           Clicked="Settings_Clicked" />
+                           Clicked="Settings_Clicked">
+            <controls:FaButton.Margin>
+                <OnPlatform x:TypeArguments="Thickness">
+                    <On Platform="iOS" Value="0, 10, 0, 0" />
+                    <On Platform="Android" Value="0" />
+                </OnPlatform>
+            </controls:FaButton.Margin>
+        </controls:FaButton>
         <StackLayout VerticalOptions="CenterAndExpand" Spacing="20">
             <Image
                 x:Name="_logo"
diff --git a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
index 72138df8b..7254e69a8 100644
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -23,7 +23,6 @@ namespace Bit.App.Pages
         private readonly IStorageService _storageService;
         private readonly ISyncService _syncService;
 
-        private string _fingerprintName;
         private bool _supportsFingerprint;
         private bool _pin;
         private bool _fingerprint;
@@ -57,12 +56,6 @@ namespace Bit.App.Pages
 
             GroupedItems = new ExtendedObservableCollection<SettingsPageListGroup>();
             PageTitle = AppResources.Settings;
-
-            _fingerprintName = AppResources.Fingerprint;
-            if(Device.RuntimePlatform == Device.iOS)
-            {
-                _fingerprintName = _deviceActionService.SupportsFaceId() ? AppResources.FaceID : AppResources.TouchID;
-            }
         }
 
         public ExtendedObservableCollection<SettingsPageListGroup> GroupedItems { get; set; }
@@ -329,9 +322,15 @@ namespace Bit.App.Pages
             };
             if(_supportsFingerprint)
             {
+                var fingerprintName = AppResources.Fingerprint;
+                if(Device.RuntimePlatform == Device.iOS)
+                {
+                    fingerprintName = _deviceActionService.SupportsFaceId() ?
+                        AppResources.FaceID : AppResources.TouchID;
+                }
                 var item = new SettingsPageListItem
                 {
-                    Name = string.Format(AppResources.UnlockWith, _fingerprintName),
+                    Name = string.Format(AppResources.UnlockWith, fingerprintName),
                     SubLabel = _fingerprint ? AppResources.Enabled : AppResources.Disabled
                 };
                 securityItems.Insert(1, item);