From 77314d4b8de8f142e2d3a40d79499c40517e9319 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 14 Jun 2019 17:40:21 -0400
Subject: [PATCH] cleanup search page for ios

---
 src/App/Pages/Vault/CiphersPage.xaml    | 12 ++++++------
 src/App/Pages/Vault/CiphersPage.xaml.cs | 12 +++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/App/Pages/Vault/CiphersPage.xaml b/src/App/Pages/Vault/CiphersPage.xaml
index 71f29893e..0906a1d69 100644
--- a/src/App/Pages/Vault/CiphersPage.xaml
+++ b/src/App/Pages/Vault/CiphersPage.xaml
@@ -15,13 +15,11 @@
         <pages:CiphersPageViewModel />
     </ContentPage.BindingContext>
 
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-    </ContentPage.ToolbarItems>
-
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:DateTimeConverter x:Key="dateTime" />
+            <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
+                         x:Name="_closeItem" x:Key="closeItem" />
         </ResourceDictionary>
     </ContentPage.Resources>
 
@@ -31,12 +29,14 @@
             VerticalOptions="FillAndExpand"
             HorizontalOptions="FillAndExpand"
             Spacing="0"
-            Padding="0">
+            Padding="0"
+            x:Name="_titleLayout">
             <controls:MiButton
                 StyleClass="btn-title, btn-title-platform"
                 Text="&#xe5c4;"
                 VerticalOptions="CenterAndExpand"
-                Clicked="BackButton_Clicked" />
+                Clicked="BackButton_Clicked"
+                x:Name="_backButton" />
             <SearchBar
                 x:Name="_searchBar"
                 HorizontalOptions="FillAndExpand"
diff --git a/src/App/Pages/Vault/CiphersPage.xaml.cs b/src/App/Pages/Vault/CiphersPage.xaml.cs
index ead54f8c9..191210611 100644
--- a/src/App/Pages/Vault/CiphersPage.xaml.cs
+++ b/src/App/Pages/Vault/CiphersPage.xaml.cs
@@ -40,9 +40,10 @@ namespace Bit.App.Pages
                 _vm.PageTitle = AppResources.SearchVault;
             }
 
-            if(Device.RuntimePlatform == Device.Android)
+            if(Device.RuntimePlatform == Device.iOS)
             {
-                ToolbarItems.RemoveAt(0);
+                ToolbarItems.Add(_closeItem);
+                _titleLayout.Children.Remove(_backButton);
             }
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
         }
@@ -121,12 +122,9 @@ namespace Bit.App.Pages
             }
         }
 
-        private async void Close_Clicked(object sender, System.EventArgs e)
+        private void Close_Clicked(object sender, EventArgs e)
         {
-            if(DoOnce())
-            {
-                await Navigation.PopModalAsync();
-            }
+            GoBack();
         }
     }
 }