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

Fix RegExp and Avatar

Author: KoalaSat

frontend/src/basic/SettingsPage/index.tsx

@@ -14,14 +14,18 @@ const SettingsPage = (): JSX.Element => {
   const [newUrl, setNewUrl] = useState<string>('');
   const [error, setError] = useState<string>();
   // Regular expression to match a valid .onion URL
-  const onionUrlPattern = /^(http:\/\/|https:\/\/)?[a-zA-Z2-7]{16,56}\.onion$/;
+  const onionUrlPattern = /^((http|https):\/\/)?[a-zA-Z2-7]{16,56}\.onion$/;
 
   const addCoordinator = () => {
     if (federation.coordinators[newAlias]) {
       setError(t('Alias already exists'));
     } else {
       if (onionUrlPattern.test(newUrl)) {
-        addNewCoordinator(newAlias, newUrl);
+        let fullNewUrl = newUrl;
+        if (!/^((http|https):\/\/)/.test(fullNewUrl)) {
+          fullNewUrl = `http://${newUrl}`;
+        }
+        addNewCoordinator(newAlias, fullNewUrl);
         setNewAlias('');
         setNewUrl('');
       } else {

frontend/src/components/Dialogs/Coordinator.tsx

@@ -344,7 +344,7 @@ const BadgesHall = ({ badges, size_limit }: BadgesProps): JSX.Element => {
   );
 };
 
-const CoordinatorDialog = ({ open = false, onClose, network, shortAlias }: Props): JSX.Element => {
+const CoordinatorDialog = ({ open = false, onClose, shortAlias }: Props): JSX.Element => {
   const { t } = useTranslation();
   const { clientVersion, page, settings, origin } = useContext(AppContext);
   const { federation } = useContext<UseFederationStoreType>(FederationContext);
@@ -369,7 +369,7 @@ const CoordinatorDialog = ({ open = false, onClose, network, shortAlias }: Props
               <Grid item>
                 <RobotAvatar
                   shortAlias={coordinator?.federated ? coordinator?.shortAlias : undefined}
-                  hashId={coordinator?.federated ? undefined : coordinator?.shortAlias}
+                  hashId={coordinator?.federated ? undefined : coordinator?.mainnet.onion}
                   style={{ width: '7.5em', height: '7.5em' }}
                   smooth={true}
                 />