From 4a94d09de3d9457c8825b665b56723972bb1ad5d Mon Sep 17 00:00:00 2001
From: Graeme Arthur <garthur@duckduckgo.com>
Date: Tue, 14 Nov 2023 17:51:44 +0100
Subject: [PATCH] Udpate after merge conflict resolution

---
 .../NetworkProtectionConvenienceInitialisers.swift       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift b/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
index fa60e6e804..7cf701ffa1 100644
--- a/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
+++ b/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
@@ -54,7 +54,8 @@ extension NetworkProtectionKeychainTokenStore {
 
 extension NetworkProtectionCodeRedemptionCoordinator {
     convenience init() {
-        self.init(tokenStore: NetworkProtectionKeychainTokenStore(), errorEvents: .networkProtectionAppDebugEvents)
+        let tunnelSettings = TunnelSettings(defaults: .networkProtectionGroupDefaults)
+        self.init(environment: tunnelSettings.selectedEnvironment, tokenStore: NetworkProtectionKeychainTokenStore(), errorEvents: .networkProtectionAppDebugEvents)
     }
 }
 
@@ -78,7 +79,11 @@ extension NetworkProtectionVPNSettingsViewModel {
 
 extension NetworkProtectionVPNLocationViewModel {
     convenience init() {
-        let locationListRepository = NetworkProtectionLocationListCompositeRepository(tokenStore: NetworkProtectionKeychainTokenStore())
+        let tunnelSettings = TunnelSettings(defaults: .networkProtectionGroupDefaults)
+        let locationListRepository = NetworkProtectionLocationListCompositeRepository(
+            environment: tunnelSettings.selectedEnvironment,
+            tokenStore: NetworkProtectionKeychainTokenStore()
+        )
         self.init(
             locationListRepository: locationListRepository,
             tunnelSettings: TunnelSettings(defaults: .networkProtectionGroupDefaults)