Updated Add new item button text when creating a new passkey

bitwarden · Apr 3, 2024 · 0292071 · 0292071
1 parent 9ae67b3
commit 0292071
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/App/Platforms/Android/Services/DeviceActionService.cs b/src/App/Platforms/Android/Services/DeviceActionService.cs
@@ -576,12 +576,10 @@ public async Task ExecuteFido2CredentialActionAsync(AppOptions appOptions)
 
             if (appOptions.Fido2CredentialAction == CredentialProviderConstants.Fido2CredentialGet)
             {
-                //TODO: Old POC code used for auth of a passkey after unlock. Maybe it can be reused
                 await ExecuteFido2GetCredentialAsync(appOptions);
             }
             else if (appOptions.Fido2CredentialAction == CredentialProviderConstants.Fido2CredentialCreate)
             {
-                //TODO: Old POC code used for creating a passkey after unlock. Maybe it can be reused
                 await ExecuteFido2CreateCredentialAsync();
             }
 

diff --git a/src/Core/Pages/Vault/AutofillCiphersPageViewModel.cs b/src/Core/Pages/Vault/AutofillCiphersPageViewModel.cs
@@ -44,6 +44,7 @@ public override void Init(AppOptions appOptions)
             Name = name;
             PageTitle = string.Format(AppResources.ItemsForUri, Name ?? "--");
             NoDataText = string.Format(AppResources.NoItemsForUri, Name ?? "--");
+            AddNewItemText = appOptions.FromFido2Framework ? AppResources.SavePasskeyAsNewLogin : AppResources.AddAnItem;
         }
 
         protected override async Task<List<GroupingsPageListGroup>> LoadGroupedItemsAsync()

diff --git a/src/Core/Pages/Vault/CipherSelectionPage.xaml b/src/Core/Pages/Vault/CipherSelectionPage.xaml
@@ -83,7 +83,7 @@
                         Text="{Binding NoDataText}"
                         HorizontalTextAlignment="Center"></Label>
                     <Button
-                        Text="{u:I18n AddAnItem}"
+                        Text="{Binding AddNewItemText}"
                         Command="{Binding AddCipherCommand}" />
                 </StackLayout>
 

diff --git a/src/Core/Pages/Vault/CipherSelectionPageViewModel.cs b/src/Core/Pages/Vault/CipherSelectionPageViewModel.cs
@@ -4,6 +4,7 @@
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.View;
+using Bit.Core.Resources.Localization;
 using Bit.Core.Utilities;
 
 namespace Bit.App.Pages
@@ -22,6 +23,7 @@ public abstract class CipherSelectionPageViewModel : BaseViewModel
         protected bool _showNoData;
         protected bool _showList;
         protected string _noDataText;
+        protected string _addNewItemText;
         protected bool _websiteIconsEnabled;
 
         public CipherSelectionPageViewModel()
@@ -53,6 +55,8 @@ public CipherSelectionPageViewModel()
             {
                 AllowAddAccountRow = false
             };
+
+            AddNewItemText = AppResources.AddAnItem;
         }
 
         public string Name { get; set; }
@@ -83,6 +87,12 @@ public string NoDataText
             set => SetProperty(ref _noDataText, value);
         }
 
+        public string AddNewItemText
+        {
+            get => _addNewItemText;
+            set => SetProperty(ref _addNewItemText, value);
+        }
+
         public bool WebsiteIconsEnabled
         {
             get => _websiteIconsEnabled;