--- a/Simoleon/Conversion.swift	Mon Jul 26 15:35:06 2021 +0100
+++ b/Simoleon/Conversion.swift	Mon Jul 26 17:35:57 2021 +0100
@@ -9,6 +9,7 @@
 import Purchases
 
 struct Conversion: View {
+    var showNavigationView: Bool?
     @State var currencyPair: String
     @State private var amountToConvert = "1000"
     @State private var price: Double = 1.00
@@ -31,6 +32,7 @@
                                     .padding(.horizontal)
                             )
                     }
+                    .accessibilityIdentifier("CurrencySelector")
                     
                     FavouriteButton(currencyPair: currencyPair)
                 }
@@ -51,7 +53,7 @@
         .onAppear(perform: request)
         .navigationTitle(Text("Convert", comment: "Navigation title"))
         .toolbar {
-            ToolbarItem(placement: .cancellationAction) {
+            ToolbarItem(placement: .navigationBarTrailing) {
                 if amountIsEditing {
                     Button(action: {
                         UIApplication.shared.dismissKeyboard()
@@ -62,7 +64,7 @@
                 }
             }
         }
-        .if(UIDevice.current.userInterfaceIdiom == .phone) { content in
+        .if(UIDevice.current.userInterfaceIdiom == .phone && showNavigationView ?? true) { content in
             NavigationView { content }
         }
     }