Removes testnet background image when running on mainnet. Fixes issue #…

…128
ACINQ · Mar 19, 2021 · dd398ac · dd398ac
1 parent 00d047f
commit dd398ac
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 22 deletions.
diff --git a/phoenix-ios/phoenix-ios/views/HomeView.swift b/phoenix-ios/phoenix-ios/views/HomeView.swift
@@ -46,8 +46,10 @@ struct HomeView : MVIView {
 
 		ZStack {
 
-			Image("testnet_bg")
-				.resizable(resizingMode: .tile)
+			if AppDelegate.get().business.chain == Chain.testnet {
+				Image("testnet_bg")
+					.resizable(resizingMode: .tile)
+			}
 
 			VStack {
 

diff --git a/phoenix-ios/phoenix-ios/views/ReceiveView.swift b/phoenix-ios/phoenix-ios/views/ReceiveView.swift
@@ -53,8 +53,10 @@ struct ReceiveView: MVIView {
 
 		ZStack {
 
-			Image("testnet_bg")
-				.resizable(resizingMode: .tile)
+			if AppDelegate.get().business.chain == Chain.testnet {
+				Image("testnet_bg")
+					.resizable(resizingMode: .tile)
+			}
 
 			if verticalSizeClass == UserInterfaceSizeClass.compact {
 				mainLandscape()

diff --git a/phoenix-ios/phoenix-ios/views/ScanView.swift b/phoenix-ios/phoenix-ios/views/ScanView.swift
@@ -113,8 +113,10 @@ struct ReadyView: View {
 
 		ZStack {
 
-			Image("testnet_bg")
-				.resizable(resizingMode: .tile)
+			if AppDelegate.get().business.chain == Chain.testnet {
+				Image("testnet_bg")
+					.resizable(resizingMode: .tile)
+			}
 
 			VStack {
 				Spacer()
@@ -291,19 +293,21 @@ struct ValidateView: View {
 			Color.primaryBackground
 				.ignoresSafeArea(.all, edges: .all)
 
-			Image("testnet_bg")
-				.resizable(resizingMode: .tile)
-				.ignoresSafeArea(.all, edges: .all)
-				.onTapGesture {
-					// dismiss keyboard (number pad) if visible
-					let keyWindow = UIApplication.shared.connectedScenes
-						.filter({ $0.activationState == .foregroundActive })
-						.map({ $0 as? UIWindowScene })
-						.compactMap({ $0 })
-						.first?.windows
-						.filter({ $0.isKeyWindow }).first
-					keyWindow?.endEditing(true)
-				}
+			if AppDelegate.get().business.chain == Chain.testnet {
+				Image("testnet_bg")
+					.resizable(resizingMode: .tile)
+					.ignoresSafeArea(.all, edges: .all)
+					.onTapGesture {
+						dismissKeyboardIfVisible()
+					}
+			} else {
+				Color.clear
+					.ignoresSafeArea(.all, edges: .all)
+					.contentShape(Rectangle())
+					.onTapGesture {
+						dismissKeyboardIfVisible()
+					}
+			}
 
 			VStack {
 
@@ -417,6 +421,18 @@ struct ValidateView: View {
 		}
 	}
 
+	func dismissKeyboardIfVisible() -> Void {
+		log.trace("(ValidateView) dismissKeyboardIfVisible()")
+
+		let keyWindow = UIApplication.shared.connectedScenes
+			.filter({ $0.activationState == .foregroundActive })
+			.map({ $0 as? UIWindowScene })
+			.compactMap({ $0 })
+			.first?.windows
+			.filter({ $0.isKeyWindow }).first
+		keyWindow?.endEditing(true)
+	}
+
 	func amountDidChange() -> Void {
 		log.trace("(ValidateView) amountDidChange()")
 
@@ -536,8 +552,10 @@ struct SendingView: View {
 
 		ZStack {
 
-			Image("testnet_bg")
-				.resizable(resizingMode: .tile)
+			if AppDelegate.get().business.chain == Chain.testnet {
+				Image("testnet_bg")
+					.resizable(resizingMode: .tile)
+			}
 
 			VStack {
 				Text("Sending Payment...")

diff --git a/phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/PhoenixBusiness.kt b/phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/PhoenixBusiness.kt
@@ -58,7 +58,7 @@ class PhoenixBusiness(private val ctx: PlatformContext) {
     private val appDb by lazy { SqliteAppDb(createAppDbDriver(ctx)) }
     private val paymentsDb by lazy { SqlitePaymentsDb(createPaymentsDbDriver(ctx)) }
 
-    private val chain = Chain.TESTNET
+    public val chain = Chain.TESTNET
 
     private val electrumClient by lazy { ElectrumClient(tcpSocketBuilder, MainScope()) }
     private val electrumWatcher by lazy { ElectrumWatcher(electrumClient, MainScope()) }