Merge branch 'master' into elias/fix-remote-development-headers

dfinity · Jan 22, 2024 · ea37ced · ea37ced
2 parents e68bfc6 + c24644f
commit ea37ced
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/tools/ui/Cargo.lock b/tools/ui/Cargo.lock
diff --git a/tools/ui/src/candid.ts b/tools/ui/src/candid.ts
@@ -12,16 +12,18 @@ declare var d3: any;
 
 const names: Record<number,string> = {};
 
-function is_local(agent: HttpAgent) {
+function isKnownMainnet(agent: HttpAgent) {
   // @ts-ignore
   const hostname = agent._host.hostname;
-  return hostname === '127.0.0.1' || hostname.endsWith('localhost');
+  return hostname.endsWith('.icp0.io') || hostname.endsWith('.ic0.app');
 }
 
 export let authClient: AuthClient | undefined;
 
-const agent = new HttpAgent();
-if (is_local(agent)) {
+const agent = new HttpAgent({
+  host: window.location.host.replace(/^(localhost)(:\d+)?$/, '127.0.0.1$2')
+});
+if (!isKnownMainnet(agent)) {
   agent.fetchRootKey();
 }