Merge conflicts

nym-connect/desktop/src-tauri/src/main.rs

@@ -12,6 +12,8 @@ use tokio::sync::RwLock;
 use crate::menu::{create_tray_menu, tray_menu_event_handler};
 use crate::state::State;
 use crate::window::window_toggle;
+use std::path::PathBuf;
+
 
 mod config;
 mod error;
@@ -25,7 +27,8 @@ mod tasks;
 mod window;
 
 fn main() {
-    setup_env(None);
+    let path = PathBuf::from("/Users/benedetta/nym/workspace/nym/envs/qa-qwerty.env");
+    setup_env(Some(&path));
     println!("Starting up...");
 
     // As per breaking change description here

nym-connect/desktop/src-tauri/src/operations/directory/mod.rs

@@ -8,12 +8,10 @@ use nym_api_requests::models::GatewayBondAnnotated;
 use nym_contracts_common::types::Percent;
 
 static SERVICE_PROVIDER_WELLKNOWN_URL: &str =
-    "https://nymtech.net/.wellknown/connect/service-providers.json";
-
-static HARBOUR_MASTER_URL: &str = "https://harbourmaster.nymtech.net/v1/services/?size=100";
-
+    "http://178.79.159.92/service-providers.json";
+static HARBOUR_MASTER_URL: &str = "http://178.79.159.92/harbourmaster.json";
 static GATEWAYS_DETAILED_URL: &str =
-    "https://validator.nymtech.net/api/v1/status/gateways/detailed";
+    "https://qwerty-validator-api.qa.nymte.ch/api/v1/status/gateways/detailed";
 
 #[tauri::command]
 pub async fn get_services() -> Result<Vec<DirectoryServiceProvider>> {