From 46a8ffa5ae8a0cedabac4dae41e72dac251e419e Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 30 May 2019 08:35:50 -0400
Subject: [PATCH] pop page on delete success

---
 src/App/Pages/Vault/AddEditPage.xaml.cs     | 5 ++++-
 src/App/Pages/Vault/AddEditPageViewModel.cs | 3 +--
 src/App/Pages/Vault/ViewPage.xaml.cs        | 5 ++++-
 src/App/Pages/Vault/ViewPageViewModel.cs    | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/App/Pages/Vault/AddEditPage.xaml.cs b/src/App/Pages/Vault/AddEditPage.xaml.cs
index 5d23b056f..666c60c35 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml.cs
+++ b/src/App/Pages/Vault/AddEditPage.xaml.cs
@@ -145,7 +145,10 @@ namespace Bit.App.Pages
         {
             if(DoOnce())
             {
-                await _vm.DeleteAsync();
+                if(await _vm.DeleteAsync())
+                {
+                    await Navigation.PopModalAsync();
+                }
             }
         }
 
diff --git a/src/App/Pages/Vault/AddEditPageViewModel.cs b/src/App/Pages/Vault/AddEditPageViewModel.cs
index c7646bcba..cf1488dc2 100644
--- a/src/App/Pages/Vault/AddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/AddEditPageViewModel.cs
@@ -424,7 +424,7 @@ namespace Bit.App.Pages
         public async Task<bool> DeleteAsync()
         {
             var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.DoYouReallyWantToDelete,
-                null, AppResources.Yes, AppResources.No);
+                null, AppResources.Yes, AppResources.Cancel);
             if(!confirmed)
             {
                 return false;
@@ -436,7 +436,6 @@ namespace Bit.App.Pages
                 await _deviceActionService.HideLoadingAsync();
                 _platformUtilsService.ShowToast("success", null, AppResources.ItemDeleted);
                 _messagingService.Send("deletedCipher");
-                await Page.Navigation.PopModalAsync();
                 return true;
             }
             catch(ApiException e)
diff --git a/src/App/Pages/Vault/ViewPage.xaml.cs b/src/App/Pages/Vault/ViewPage.xaml.cs
index d3dbb9cb9..f64d8f86f 100644
--- a/src/App/Pages/Vault/ViewPage.xaml.cs
+++ b/src/App/Pages/Vault/ViewPage.xaml.cs
@@ -127,7 +127,10 @@ namespace Bit.App.Pages
         {
             if(DoOnce())
             {
-                await _vm.DeleteAsync();
+                if(await _vm.DeleteAsync())
+                {
+                    await Navigation.PopModalAsync();
+                }
             }
         }
 
diff --git a/src/App/Pages/Vault/ViewPageViewModel.cs b/src/App/Pages/Vault/ViewPageViewModel.cs
index 9ab72ccd7..8baa0e2f3 100644
--- a/src/App/Pages/Vault/ViewPageViewModel.cs
+++ b/src/App/Pages/Vault/ViewPageViewModel.cs
@@ -251,7 +251,7 @@ namespace Bit.App.Pages
         public async Task<bool> DeleteAsync()
         {
             var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.DoYouReallyWantToDelete,
-                null, AppResources.Yes, AppResources.No);
+                null, AppResources.Yes, AppResources.Cancel);
             if(!confirmed)
             {
                 return false;