From 12f82372e5323cc376f3ce3c59ae2ca94d854fbe Mon Sep 17 00:00:00 2001
From: heyhoe <38322494+h3y6e@users.noreply.github.com>
Date: Fri, 24 Mar 2023 18:41:44 +0900
Subject: [PATCH 1/2] shorten long relay name. (#455)

---
 packages/app/src/Pages/Root.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/Pages/Root.tsx b/packages/app/src/Pages/Root.tsx
index e2ed9588..17c3a2ff 100644
--- a/packages/app/src/Pages/Root.tsx
+++ b/packages/app/src/Pages/Root.tsx
@@ -76,13 +76,16 @@ export default function RootPage() {
     const paidRelays = allRelays.filter(a => a.paid);
     const publicRelays = allRelays.filter(a => !a.paid);
     return (
-      <div className="flex mb10 f-end">
+      <div className="flex mb10 f-end nowrap">
         <FormattedMessage
           defaultMessage="Read global from"
           description="Label for reading global feed from specific relays"
         />
         &nbsp;
-        <select onChange={e => setRelay(allRelays.find(a => a.url === e.target.value))} value={relay?.url}>
+        <select
+          className="f-ellipsis"
+          onChange={e => setRelay(allRelays.find(a => a.url === e.target.value))}
+          value={relay?.url}>
           {paidRelays.length > 0 && (
             <optgroup label="Paid Relays">
               {paidRelays.map(a => (
-- 
2.45.2


From 2580fd33e59e4372f416e37543723e4b3e1aae91 Mon Sep 17 00:00:00 2001
From: Ivan Acosta-Rubio <ivan@strike.me>
Date: Sun, 26 Mar 2023 05:54:35 -0600
Subject: [PATCH 2/2] Prevents adding ws relay when over https

---
 packages/app/src/Pages/settings/Relays.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/app/src/Pages/settings/Relays.tsx b/packages/app/src/Pages/settings/Relays.tsx
index 2394b9a3..acea3200 100644
--- a/packages/app/src/Pages/settings/Relays.tsx
+++ b/packages/app/src/Pages/settings/Relays.tsx
@@ -31,6 +31,14 @@ const RelaySettingsPage = () => {
     }
   }
 
+  const handleNewRelayChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const inputValue = event.target.value;
+    const protocol = window.location.protocol;
+    if ((protocol === "https:" && inputValue.startsWith("wss://")) || protocol === "http:") {
+      setNewRelay(inputValue);
+    }
+  };
+
   function addRelay() {
     return (
       <>
@@ -43,7 +51,7 @@ const RelaySettingsPage = () => {
             className="f-grow"
             placeholder="wss://my-relay.com"
             value={newRelay}
-            onChange={e => setNewRelay(e.target.value)}
+            onChange={handleNewRelayChange}
           />
         </div>
         <button className="secondary mb10" onClick={() => addNewRelay()}>
-- 
2.45.2