Merge pull request #1352 from RoboSats/fix-custom-coordinator-error

Fix custom Coordinator error
RoboSats · Jun 25, 2024 · d72e83a · d72e83a
2 parents 8168108 + b76d40a
commit d72e83a
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 20 deletions.
diff --git a/frontend/src/basic/SettingsPage/index.tsx b/frontend/src/basic/SettingsPage/index.tsx
@@ -25,7 +25,7 @@ const SettingsPage = (): JSX.Element => {
         setNewAlias('');
         setNewUrl('');
       } else {
-        setError(t('Invalid URL'));
+        setError(t('Invalid Onion URL'));
       }
     }
   };

diff --git a/frontend/src/contexts/FederationContext.tsx b/frontend/src/contexts/FederationContext.tsx
@@ -16,6 +16,7 @@ import { federationLottery } from '../utils';
 import { AppContext, type UseAppStoreType } from './AppContext';
 import { GarageContext, type UseGarageStoreType } from './GarageContext';
 import NativeRobosats from '../services/Native';
+import { Origins } from '../models/Coordinator.model';
 
 // Refresh delays (ms) according to Order status
 const defaultDelay = 5000;
@@ -175,9 +176,13 @@ export const FederationContextProvider = ({
         enabled: true,
       };
       if (settings.network === 'mainnet') {
-        attributes.mainnet = url;
+        attributes.mainnet = {
+          onion: url,
+        } as Origins;
       } else {
-        attributes.testnet = url;
+        attributes.testnet = {
+          onion: url,
+        } as Origins;
       }
       federation.addCoordinator(origin, settings, hostUrl, attributes);
       const newCoordinator = federation.coordinators[alias];

diff --git a/frontend/static/locales/ca.json b/frontend/static/locales/ca.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Connectat a la xarxa TOR",

diff --git a/frontend/static/locales/cs.json b/frontend/static/locales/cs.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Connected to TOR network",

diff --git a/frontend/static/locales/de.json b/frontend/static/locales/de.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Connected to TOR network",

diff --git a/frontend/static/locales/en.json b/frontend/static/locales/en.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Connected to TOR network",

diff --git a/frontend/static/locales/es.json b/frontend/static/locales/es.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Conectado a la red TOR",

diff --git a/frontend/static/locales/eu.json b/frontend/static/locales/eu.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Connected to TOR network",

diff --git a/frontend/static/locales/fr.json b/frontend/static/locales/fr.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Connecté au réseau TOR",

diff --git a/frontend/static/locales/it.json b/frontend/static/locales/it.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Connesso alla rete TOR",

diff --git a/frontend/static/locales/ja.json b/frontend/static/locales/ja.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "TORネットワークに接続しました",

diff --git a/frontend/static/locales/pl.json b/frontend/static/locales/pl.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Connected to TOR network",

diff --git a/frontend/static/locales/pt.json b/frontend/static/locales/pt.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Conectado à rede TOR",

diff --git a/frontend/static/locales/ru.json b/frontend/static/locales/ru.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Подключено к сети TOR",

diff --git a/frontend/static/locales/sv.json b/frontend/static/locales/sv.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Connected to TOR network",

diff --git a/frontend/static/locales/sw.json b/frontend/static/locales/sw.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Kuunganishwa kwa mtandao wa TOR",

diff --git a/frontend/static/locales/th.json b/frontend/static/locales/th.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "Connected to TOR network",

diff --git a/frontend/static/locales/zh-SI.json b/frontend/static/locales/zh-SI.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "已连线 TOR 网络",

diff --git a/frontend/static/locales/zh-TR.json b/frontend/static/locales/zh-TR.json
@@ -78,7 +78,7 @@
   "Add": "Add",
   "Alias": "Alias",
   "Alias already exists": "Alias already exists",
-  "Invalid URL": "Invalid URL",
+  "Invalid Onion URL": "Invalid Onion URL",
   "URL": "URL",
   "#14": "Phrases in components/TorConnection.tsx",
   "Connected to TOR network": "已連線 TOR 網絡",