From 6aeec4a89a58b542e3636e55cb7d1a5536de12be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Bispo?= <abispo@bitwarden.com>
Date: Thu, 23 Jun 2022 11:31:50 +0100
Subject: [PATCH] PS-70  Added label on top of button to solve UI bug.

---
 src/App/Pages/Vault/AddEditPage.xaml        | 12 +++++++++++-
 src/App/Pages/Vault/AddEditPageViewModel.cs |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/App/Pages/Vault/AddEditPage.xaml b/src/App/Pages/Vault/AddEditPage.xaml
index 198d7f927..278bc5b19 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml
+++ b/src/App/Pages/Vault/AddEditPage.xaml
@@ -192,12 +192,22 @@
                             Grid.Row="0"
                             Grid.Column="0" />
                         <Button 
-                            Text="{Binding SetupTotpText}" 
                             IsVisible="{Binding HasTotpValue, Converter={StaticResource inverseBool}}"
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="3"
                             Clicked="ScanTotp_Clicked"/>
+                        <controls:IconLabel 
+                            Text="{Binding SetupTotpText}" 
+                            IsVisible="{Binding HasTotpValue, Converter={StaticResource inverseBool}}" 
+                            Margin="0,5,0,0"
+                            HorizontalOptions="Center"
+                            VerticalOptions="FillAndExpand"
+                            VerticalTextAlignment="Center"
+                            Padding="0"
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3" />
                         <controls:MonoEntry
                             x:Name="_loginTotpEntry"
                             Text="{Binding Cipher.Login.Totp}"
diff --git a/src/App/Pages/Vault/AddEditPageViewModel.cs b/src/App/Pages/Vault/AddEditPageViewModel.cs
index d35fb9122..6a56be80e 100644
--- a/src/App/Pages/Vault/AddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/AddEditPageViewModel.cs
@@ -864,6 +864,7 @@ namespace Bit.App.Pages
                 await _platformUtilsService.ShowDialogAsync(AppResources.PasswordSafe);
             }
         }
+
         private async void CopyTotpClipboard()
         {
             await _clipboardService.CopyTextAsync(_cipher.Login.Totp);