From fdaa11408c6ea5c63f62dc28e14b6f221905d2e7 Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Tue, 25 Jul 2023 20:22:12 +0700
Subject: [PATCH] Update for more stable (#433)

---
 app/components/ChannelMessageForm.tsx |  8 ++++---
 app/components/DirectMessageForm.tsx  |  8 ++++---
 app/components/RelayProvider.tsx      |  8 +++----
 app/components/ScreenWithSidebar.tsx  | 30 ++++++++++++++------------
 app/components/User.tsx               | 26 ++++++++++++++--------
 app/models/Channel.ts                 | 12 ++---------
 app/models/UserStore.ts               |  2 +-
 app/screens/AddContactScreen.tsx      | 24 +++++++++++++++------
 app/screens/ChannelsScreen.tsx        |  2 +-
 app/screens/DirectMessageScreen.tsx   |  2 +-
 app/screens/EditProfileScreen.tsx     | 12 +++++++----
 app/screens/InviteScreen.tsx          | 16 ++++++++------
 app/screens/NewMessageScreen.tsx      | 19 ++++++++++++----
 app/screens/ProfileScreen.tsx         | 18 +++-------------
 app/screens/RelayManagerScreen.tsx    |  4 ++--
 app/screens/UserScreen.tsx            | 31 +++++++++++++++++----------
 16 files changed, 126 insertions(+), 96 deletions(-)

diff --git a/app/components/ChannelMessageForm.tsx b/app/components/ChannelMessageForm.tsx
index d35c8fb0..c11cb372 100644
--- a/app/components/ChannelMessageForm.tsx
+++ b/app/components/ChannelMessageForm.tsx
@@ -167,6 +167,7 @@ export const ChannelMessageForm = observer(function ChannelMessageForm({
             autoCapitalize="none"
             autoCorrect={true}
             autoComplete="name"
+            multiline={true}
             LeftAccessory={() => (
               <Button
                 onPress={() => imagePicker()}
@@ -217,15 +218,16 @@ const $inputWrapper: ViewStyle = {
   paddingVertical: spacing.extraSmall,
   paddingHorizontal: spacing.large,
   gap: spacing.small,
+  minHeight: 40,
 }
 
 const $input: ViewStyle = {
-  height: 40,
+  minHeight: 40,
   borderWidth: 0,
-  borderRadius: 100,
+  borderRadius: 20,
   backgroundColor: colors.palette.overlay20,
   paddingHorizontal: spacing.medium,
-  paddingVertical: 0,
+  paddingVertical: spacing.tiny,
   marginVertical: 0,
   marginHorizontal: 0,
   alignSelf: "center",
diff --git a/app/components/DirectMessageForm.tsx b/app/components/DirectMessageForm.tsx
index c410ecf0..157a59f1 100644
--- a/app/components/DirectMessageForm.tsx
+++ b/app/components/DirectMessageForm.tsx
@@ -153,6 +153,7 @@ export const DirectMessageForm = observer(function DirectMessageForm({
         value={value}
         autoCapitalize="none"
         autoCorrect={false}
+        multiline={true}
         LeftAccessory={() => (
           <View style={$leftAccessory}>
             <Button
@@ -199,15 +200,16 @@ const $inputWrapper: ViewStyle = {
   paddingVertical: spacing.extraSmall,
   paddingHorizontal: spacing.large,
   gap: spacing.small,
+  minHeight: 40,
 }
 
 const $input: ViewStyle = {
-  height: 40,
+  minHeight: 40,
   borderWidth: 0,
-  borderRadius: 100,
+  borderRadius: 20,
   backgroundColor: colors.palette.overlay20,
   paddingHorizontal: spacing.medium,
-  paddingVertical: 0,
+  paddingVertical: spacing.tiny,
   marginVertical: 0,
   marginHorizontal: 0,
   alignSelf: "center",
diff --git a/app/components/RelayProvider.tsx b/app/components/RelayProvider.tsx
index d82186a5..4d9a0e03 100644
--- a/app/components/RelayProvider.tsx
+++ b/app/components/RelayProvider.tsx
@@ -5,7 +5,7 @@ import {
   ArcadeIdentity,
   NostrPool,
   ArcadeDb,
-  ArcadeSocial,
+  // ArcadeSocial,
   ChannelManager,
   PrivateMessageManager,
 } from "app/arclib/src"
@@ -19,7 +19,7 @@ export const RelayContext = createContext({
   contactManager: null as ContactManager,
   profileManager: null as ProfileManager,
   privMessageManager: null as PrivateMessageManager,
-  social: null as ArcadeSocial,
+  // social: null as ArcadeSocial,
 })
 const db: ArcadeDb = connectDb()
 
@@ -38,7 +38,7 @@ export const RelayProvider = observer(function RelayProvider({
   const [pool, _setPool] = useState<NostrPool>(
     () => new NostrPool(ident, db, { skipVerification: true }),
   )
-  const social = useMemo(() => new ArcadeSocial(pool, ident), [pool, ident])
+  // const social = useMemo(() => new ArcadeSocial(pool, ident), [pool, ident])
   const channelManager = useMemo(() => new ChannelManager(pool), [pool])
   const contactManager = useMemo(() => new ContactManager(pool), [pool])
   const profileManager = useMemo(() => new ProfileManager(pool), [pool])
@@ -61,7 +61,7 @@ export const RelayProvider = observer(function RelayProvider({
 
   return (
     <RelayContext.Provider
-      value={{ pool, channelManager, contactManager, profileManager, privMessageManager, social }}
+      value={{ pool, channelManager, contactManager, profileManager, privMessageManager }}
     >
       {children}
     </RelayContext.Provider>
diff --git a/app/components/ScreenWithSidebar.tsx b/app/components/ScreenWithSidebar.tsx
index 3bd1746f..92bbd4d6 100644
--- a/app/components/ScreenWithSidebar.tsx
+++ b/app/components/ScreenWithSidebar.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useRef, useState } from "react"
+import React, { FC, useCallback, useRef, useState } from "react"
 import { Platform, Pressable, View, ViewStyle } from "react-native"
 import { DrawerLayout, DrawerState } from "react-native-gesture-handler"
 import { useSharedValue, withTiming } from "react-native-reanimated"
@@ -8,7 +8,7 @@ import { colors, spacing } from "../theme"
 import { useSafeAreaInsetsStyle } from "../utils/useSafeAreaInsetsStyle"
 import { DrawerIconButton } from "./DrawerIconButton"
 import { CompassIcon, LayoutListIcon, PlusIcon } from "lucide-react-native"
-import { useNavigation } from "@react-navigation/native"
+import { useFocusEffect, useNavigation } from "@react-navigation/native"
 
 interface ScreenWithSidebarProps {
   title: string
@@ -17,22 +17,14 @@ interface ScreenWithSidebarProps {
 
 export const ScreenWithSidebar: FC<ScreenWithSidebarProps> = ({ title, children }) => {
   const [open, setOpen] = useState(false)
+
   const drawerRef = useRef<DrawerLayout>()
-  // const listRef = useRef<SectionList>()
   const progress = useSharedValue(0)
+  const $drawerInsets = useSafeAreaInsetsStyle(["top"])
+  // const listRef = useRef<SectionList>()
 
   const { navigate } = useNavigation<any>()
 
-  const toggleDrawer = () => {
-    if (!open) {
-      setOpen(true)
-      drawerRef.current?.openDrawer({ speed: 2 })
-    } else {
-      setOpen(false)
-      drawerRef.current?.closeDrawer({ speed: 2 })
-    }
-  }
-
   /*
   const handleScroll = (sectionIndex: number, itemIndex = 0) => {
     listRef.current.scrollToLocation({
@@ -44,7 +36,17 @@ export const ScreenWithSidebar: FC<ScreenWithSidebarProps> = ({ title, children
   }
   */
 
-  const $drawerInsets = useSafeAreaInsetsStyle(["top"])
+  const toggleDrawer = () => {
+    if (!open) {
+      setOpen(true)
+      drawerRef.current?.openDrawer({ speed: 2 })
+    } else {
+      setOpen(false)
+      drawerRef.current?.closeDrawer({ speed: 2 })
+    }
+  }
+
+  useFocusEffect(useCallback(() => () => drawerRef.current?.closeDrawer({ speed: 2 }), []))
 
   return (
     <DrawerLayout
diff --git a/app/components/User.tsx b/app/components/User.tsx
index 7b20df9e..8ab13f40 100644
--- a/app/components/User.tsx
+++ b/app/components/User.tsx
@@ -1,4 +1,4 @@
-import React, { memo, useContext, useEffect } from "react"
+import React, { memo, useContext /* useEffect */ } from "react"
 import { AutoImage, RelayContext, Text } from "app/components"
 import { ImageStyle, Pressable, TextStyle, View, ViewStyle } from "react-native"
 import { colors, spacing } from "app/theme"
@@ -18,14 +18,15 @@ export const User = memo(function User({ pubkey, reverse, blinded }: UserProp) {
   const queryClient = useQueryClient()
   const navigation = useNavigation<any>()
 
-  const { pool, social } = useContext(RelayContext)
+  const { pool } = useContext(RelayContext)
   const { userStore } = useStores()
 
-  const [reputation, setReputation] = React.useState(null)
+  // const [reputation, setReputation] = React.useState(NaN)
 
   const { data: profile } = useQuery({
     queryKey: ["user", pubkey],
     queryFn: async () => {
+      if (userStore.pubkey === pubkey) return userStore.metadata
       const list = await pool.list([{ kinds: [0], authors: [pubkey] }], true)
       const latest = list.slice(-1)[0]
       if (latest) {
@@ -44,6 +45,7 @@ export const User = memo(function User({ pubkey, reverse, blinded }: UserProp) {
     }
   }
 
+  /*
   useEffect(() => {
     const getReputation = async () => {
       const rep = await social.getReputation(pubkey)
@@ -51,6 +53,7 @@ export const User = memo(function User({ pubkey, reverse, blinded }: UserProp) {
     }
     getReputation()
   }, [])
+  */
 
   return (
     <>
@@ -66,12 +69,17 @@ export const User = memo(function User({ pubkey, reverse, blinded }: UserProp) {
         )}
       </Pressable>
       <View style={reverse ? $userTitleReverse : $userTitle}>
-        <Text
-          preset="bold"
-          size="xs"
-          style={$userName}
-          numberOfLines={1} >
-          {profile?.username || profile?.display_name || shortenKey(pubkey)} { reputation === null ? <Text size="xxs">(loading)</Text> : isNaN(reputation) ? <Text size="xxs">(no reputation)</Text> : <Text size="xs">{(reputation * 100).toFixed(2)}%</Text> }
+        <Text preset="bold" size="xs" style={$userName} numberOfLines={1}>
+          {profile?.username || profile?.display_name || shortenKey(pubkey)}{" "}
+          {/*
+          {reputation === null ? (
+            <Text size="xxs">(loading)</Text>
+          ) : isNaN(reputation) ? (
+            <Text size="xxs">(no reputation)</Text>
+          ) : (
+            <Text size="xs">{(reputation * 100).toFixed(2)}%</Text>
+          )}
+          */}
         </Text>
       </View>
     </>
diff --git a/app/models/Channel.ts b/app/models/Channel.ts
index 4f4b6e4b..eb0b1cfd 100644
--- a/app/models/Channel.ts
+++ b/app/models/Channel.ts
@@ -12,8 +12,6 @@ import { withSetPropAction } from "./helpers/withSetPropAction"
 import { MessageModel } from "./Message"
 import { QueryClient } from "@tanstack/react-query"
 
-const nHoursAgo = (hrs: number): number => Math.floor((Date.now() - hrs * 60 * 60 * 1000) / 1000)
-
 /**
  * Model description here for TypeScript hints.
  */
@@ -54,7 +52,7 @@ export const ChannelModel = types
     ) {
       const events = yield channel.list({
         channel_id: self.id,
-        filter: { since: nHoursAgo(72), limit: 200 },
+        filter: { limit: 500 },
         db_only: self.db,
         privkey: self.privkey,
       })
@@ -72,18 +70,12 @@ export const ChannelModel = types
       const uniqueEvents = events.filter(
         (obj, index) => events.findIndex((item) => item.id === obj.id) === index,
       )
-      const lastMessage = uniqueEvents.slice(-1)[0]
-      if (lastMessage) {
-        self.setProp("lastMessage", lastMessage.content)
-        self.setProp("lastMessagePubkey", lastMessage.pubkey)
-        self.setProp("lastMessageAt", lastMessage.created_at)
-      }
       self.setProp("loading", false)
       self.setProp("db", true)
       self.messages = cast(uniqueEvents)
     }),
     updateLastMessage() {
-      const lastMessage = self.messages.slice(-1)[0]
+      const lastMessage = self.messages.sort((a, b) => b.created_at - a.created_at)[0]
       if (lastMessage) {
         self.setProp("lastMessage", lastMessage.content)
         self.setProp("lastMessagePubkey", lastMessage.pubkey)
diff --git a/app/models/UserStore.ts b/app/models/UserStore.ts
index 3468239d..f3f1f105 100644
--- a/app/models/UserStore.ts
+++ b/app/models/UserStore.ts
@@ -123,7 +123,7 @@ export const UserStoreModel = types
       const chats = getSnapshot(self.privMessages)
       chats.forEach((chat) => {
         if (chat.pubkey === self.pubkey) {
-          chat.pubkey = chat.tags.find((el) => el[0] === "p")[1]
+          chat.pubkey = chat.tags.find((el) => el[0] === "p")?.[1] ?? chat.pubkey
         }
       })
       return [...new Map(chats.map((item) => [item.pubkey, item])).values()]
diff --git a/app/screens/AddContactScreen.tsx b/app/screens/AddContactScreen.tsx
index 08d9f01d..53d9c87d 100644
--- a/app/screens/AddContactScreen.tsx
+++ b/app/screens/AddContactScreen.tsx
@@ -118,7 +118,10 @@ export const AddContactScreen: FC<AddContactScreenProps> = observer(function Add
         <View style={$item}>
           <ContactItem pubkey={item.pubkey} fallback={item.profile?.content} />
           {added ? (
-            <Pressable onPress={() => removeContact(item.pubkey, contactManager)}>
+            <Pressable
+              onPress={() => removeContact(item.pubkey, contactManager)}
+              style={$addButton}
+            >
               <Text text="Remove" size="xs" />
             </Pressable>
           ) : (
@@ -126,6 +129,7 @@ export const AddContactScreen: FC<AddContactScreenProps> = observer(function Add
               onPress={() =>
                 addContact({ pubkey: item.pubkey, legacy: true, secret: false }, contactManager)
               }
+              style={$addButton}
             >
               <Text text="Add" size="xs" />
             </Pressable>
@@ -189,12 +193,14 @@ export const AddContactScreen: FC<AddContactScreenProps> = observer(function Add
                 style={[$formInput, $formInputText]}
               />
             </View>
-            <Button
-              text="Add"
-              style={$formButton}
-              pressedStyle={$formButtonActive}
-              onPress={() => addCustomContact()}
-            />
+            {customContact.length > 0 && (
+              <Button
+                text="Add"
+                style={$formButton}
+                pressedStyle={$formButtonActive}
+                onPress={() => addCustomContact()}
+              />
+            )}
           </View>
         </BottomSheetView>
       </BottomSheetModal>
@@ -280,3 +286,7 @@ const $formButtonActive: ViewStyle = {
 const $errorText: TextStyle = {
   color: colors.error,
 }
+
+const $addButton: ViewStyle = {
+  paddingRight: spacing.small,
+}
diff --git a/app/screens/ChannelsScreen.tsx b/app/screens/ChannelsScreen.tsx
index 93272ecb..0cba392b 100644
--- a/app/screens/ChannelsScreen.tsx
+++ b/app/screens/ChannelsScreen.tsx
@@ -125,7 +125,7 @@ export const ChannelsScreen: FC<ChannelsScreenProps> = observer(function Channel
               ) : (
                 <Button
                   onPress={() => navigation.navigate("Chat", item)}
-                  text="View channel"
+                  text="Joined"
                   style={$itemButton}
                 />
               )}
diff --git a/app/screens/DirectMessageScreen.tsx b/app/screens/DirectMessageScreen.tsx
index 887e98b6..53989616 100644
--- a/app/screens/DirectMessageScreen.tsx
+++ b/app/screens/DirectMessageScreen.tsx
@@ -59,7 +59,7 @@ export const DirectMessageScreen: FC<DirectMessageScreenProps> = observer(
         headerShown: true,
         header: () => (
           <Header
-            title={name || "Direct Message"}
+            title={name.length > 20 ? name.substring(0, 20) + "..." : name || "Direct Message"}
             titleStyle={{ color: colors.palette.white }}
             leftIcon="back"
             leftIconColor={colors.palette.cyan400}
diff --git a/app/screens/EditProfileScreen.tsx b/app/screens/EditProfileScreen.tsx
index 67746c4e..fba6ab55 100644
--- a/app/screens/EditProfileScreen.tsx
+++ b/app/screens/EditProfileScreen.tsx
@@ -13,6 +13,7 @@ import { Profile } from "app/arclib/src/profile"
 import { ImagePlusIcon } from "lucide-react-native"
 import { launchImageLibrary } from "react-native-image-picker"
 import { PrivateSettings } from "app/utils/profile"
+import { useQueryClient } from "@tanstack/react-query"
 
 interface EditProfileScreenProps
   extends NativeStackScreenProps<AppStackScreenProps<"EditProfile">> {}
@@ -20,13 +21,14 @@ interface EditProfileScreenProps
 export const EditProfileScreen: FC<EditProfileScreenProps> = observer(function EditProfileScreen() {
   const { profileManager } = useContext(RelayContext)
   const {
-    userStore: { metadata, updateMetadata },
+    userStore: { pubkey, metadata, updateMetadata },
   } = useStores()
 
   const [picture, setPicture] = useState(null)
   const [loading, setLoading] = useState(false)
 
   const formikRef = useRef(null)
+  const queryClient = useQueryClient()
 
   // Pull in navigation via hook
   const navigation = useNavigation<any>()
@@ -73,7 +75,9 @@ export const EditProfileScreen: FC<EditProfileScreenProps> = observer(function E
 
   const updateSettings = async (data: Profile & PrivateSettings) => {
     try {
-      updateMetadata(data, profileManager).then(() => navigation.navigate("Profile"))
+      await updateMetadata(data, profileManager)
+      queryClient.setQueryData(["user", pubkey], data)
+      navigation.navigate("Profile")
     } catch (e) {
       alert(`Failed to save settings: ${e}`)
     }
@@ -167,8 +171,8 @@ export const EditProfileScreen: FC<EditProfileScreenProps> = observer(function E
               label="NIP-05"
               style={$input}
               inputWrapperStyle={$inputWrapper}
-              onChangeText={handleChange("displayName")}
-              onBlur={handleBlur("displayName")}
+              onChangeText={handleChange("nip05")}
+              onBlur={handleBlur("nip05")}
               value={values.nip05}
               autoCapitalize="none"
               autoFocus={false}
diff --git a/app/screens/InviteScreen.tsx b/app/screens/InviteScreen.tsx
index 998353e1..76632001 100644
--- a/app/screens/InviteScreen.tsx
+++ b/app/screens/InviteScreen.tsx
@@ -87,7 +87,7 @@ export const InviteScreen: FC<InviteScreenProps> = observer(function InviteScree
         },
       ])
     } else {
-      Alert.alert("Confirm choose those selected contacts", "Are you sure?", [
+      Alert.alert("Confirm choosing those selected contacts", "Are you sure?", [
         {
           text: "Cancel",
         },
@@ -237,12 +237,14 @@ export const InviteScreen: FC<InviteScreenProps> = observer(function InviteScree
                       value={values.pubkey}
                     />
                   </View>
-                  <Button
-                    onPress={submitForm}
-                    text="Add"
-                    style={$formButton}
-                    pressedStyle={$formButtonActive}
-                  />
+                  {values.pubkey.length > 0 && (
+                    <Button
+                      onPress={submitForm}
+                      text="Add"
+                      style={$formButton}
+                      pressedStyle={$formButtonActive}
+                    />
+                  )}
                 </>
               )}
             </Formik>
diff --git a/app/screens/NewMessageScreen.tsx b/app/screens/NewMessageScreen.tsx
index 85b7485e..ebdc3037 100644
--- a/app/screens/NewMessageScreen.tsx
+++ b/app/screens/NewMessageScreen.tsx
@@ -6,15 +6,18 @@ import { AppStackScreenProps } from "app/navigators"
 import { ContactItem, Header, ListItem, Screen, Text } from "app/components"
 import { useNavigation } from "@react-navigation/native"
 import { colors, spacing } from "app/theme"
-import { useUserContacts } from "app/utils/useUserContacts"
 import { FlashList } from "@shopify/flash-list"
 import { Contact } from "app/arclib/src/contacts"
+import { useStores } from "app/models"
 
 interface NewMessageScreenProps extends NativeStackScreenProps<AppStackScreenProps<"NewMessage">> {}
 
 export const NewMessageScreen: FC<NewMessageScreenProps> = observer(function NewMessageScreen() {
   const navigation = useNavigation<any>()
-  const contacts = useUserContacts()
+
+  const {
+    userStore: { getContacts },
+  } = useStores()
 
   useLayoutEffect(() => {
     navigation.setOptions({
@@ -33,7 +36,15 @@ export const NewMessageScreen: FC<NewMessageScreenProps> = observer(function New
 
   const renderItem = useCallback(({ item }: { item: Contact }) => {
     return (
-      <Pressable onPress={() => navigation.navigate("DirectMessage", { id: item })} style={$item}>
+      <Pressable
+        onPress={() =>
+          navigation.navigate("DirectMessage", {
+            id: item.pubkey,
+            legacy: item.legacy,
+          })
+        }
+        style={$item}
+      >
         <ContactItem pubkey={item.pubkey} />
       </Pressable>
     )
@@ -68,7 +79,7 @@ export const NewMessageScreen: FC<NewMessageScreenProps> = observer(function New
         />
       </View>
       <FlashList
-        data={contacts}
+        data={getContacts}
         keyExtractor={(item) => item.pubkey}
         renderItem={renderItem}
         contentContainerStyle={$list}
diff --git a/app/screens/ProfileScreen.tsx b/app/screens/ProfileScreen.tsx
index 6bb7fd4a..cba7df3f 100644
--- a/app/screens/ProfileScreen.tsx
+++ b/app/screens/ProfileScreen.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useContext, useState } from "react"
+import React, { FC, useContext, useState } from "react"
 import { observer } from "mobx-react-lite"
 import {
   ImageStyle,
@@ -15,13 +15,12 @@ import * as Clipboard from "expo-clipboard"
 import { AppStackScreenProps } from "app/navigators"
 import { AutoImage, Button, ListItem, RelayContext, Screen, Text } from "app/components"
 import { colors, spacing } from "app/theme"
-import { useFocusEffect, useNavigation } from "@react-navigation/native"
+import { useNavigation } from "@react-navigation/native"
 import { nip19 } from "nostr-tools"
 import { useStores } from "app/models"
 import { shortenKey } from "app/utils/shortenKey"
 import { AxeIcon, EditIcon } from "lucide-react-native"
 import { TouchablePopupHandler } from "app/components/BlurredPopup"
-import { useProfile } from "app/utils/profile"
 
 interface ProfileScreenProps extends NativeStackScreenProps<AppStackScreenProps<"Profile">> {}
 
@@ -29,9 +28,8 @@ export const ProfileScreen: FC<ProfileScreenProps> = observer(function ProfileSc
   const [npubCopied, setNpubCopied] = useState(false)
 
   const { pool, contactManager, channelManager } = useContext(RelayContext)
-  const { getProfile } = useProfile()
   const {
-    userStore: { pubkey, metadata, updateMetadata, logout },
+    userStore: { pubkey, metadata, logout },
   } = useStores()
 
   // Pull in navigation via hook
@@ -43,16 +41,6 @@ export const ProfileScreen: FC<ProfileScreenProps> = observer(function ProfileSc
     setTimeout(() => setNpubCopied(false), 500)
   }
 
-  useFocusEffect(
-    useCallback(() => {
-      async function refetchProfile() {
-        const profile = await getProfile(pubkey)
-        await updateMetadata(profile)
-      }
-      refetchProfile()
-    }, []),
-  )
-
   return (
     <Screen style={$root} preset="scroll">
       <View style={$cover}>
diff --git a/app/screens/RelayManagerScreen.tsx b/app/screens/RelayManagerScreen.tsx
index 9186ca46..64af89d0 100644
--- a/app/screens/RelayManagerScreen.tsx
+++ b/app/screens/RelayManagerScreen.tsx
@@ -97,8 +97,8 @@ export const RelayManagerScreen: FC<RelayManagerScreenProps> = observer(
       try {
         const relay = new URL(url.replace(/\s/g, ""))
         if (
-          (domainRegex.test(relay.origin) && relay.protocol === "wss:") ||
-          relay.protocol === "ws:"
+          domainRegex.test(relay.host) &&
+          (relay.protocol === "wss:" || relay.protocol === "ws:")
         ) {
           if (!getRelays.includes(relay.origin)) {
             addRelay(relay.origin)
diff --git a/app/screens/UserScreen.tsx b/app/screens/UserScreen.tsx
index fd65c01b..5130e4f4 100644
--- a/app/screens/UserScreen.tsx
+++ b/app/screens/UserScreen.tsx
@@ -1,6 +1,6 @@
 import React, { FC, useContext, useEffect, useLayoutEffect, useState } from "react"
 import { observer } from "mobx-react-lite"
-import { ImageStyle, TextStyle, View, ViewStyle } from "react-native"
+import { Alert, ImageStyle, TextStyle, TouchableOpacity, View, ViewStyle } from "react-native"
 import { NativeStackScreenProps } from "@react-navigation/native-stack"
 import { AppStackScreenProps } from "app/navigators"
 import {
@@ -17,6 +17,7 @@ import { colors, spacing } from "app/theme"
 import { useNavigation } from "@react-navigation/native"
 import { shortenKey } from "app/utils/shortenKey"
 import { useStores } from "app/models"
+import { HelpCircleIcon } from "lucide-react-native"
 
 interface UserScreenProps extends NativeStackScreenProps<AppStackScreenProps<"User">> {}
 
@@ -177,13 +178,13 @@ export const UserScreen: FC<UserScreenProps> = observer(function UserScreen({
         <View style={$section}>
           <Text text="Contact settings" preset="bold" style={$sectionHeading} />
           <View style={$sectionData}>
-            {!secret && (
-              <ListItem
-                text="Use legacy, unblinded DM's"
-                bottomSeparator={true}
-                style={$sectionItem}
-                containerStyle={$sectionItemContainer}
-                RightComponent={
+            <ListItem
+              text="Use legacy, unblinded DM's"
+              bottomSeparator={true}
+              style={$sectionItem}
+              containerStyle={$sectionItemContainer}
+              RightComponent={
+                !secret ? (
                   <Toggle
                     id="legacy"
                     inputOuterStyle={secret ? $toggleDisabled : $toggle}
@@ -194,9 +195,17 @@ export const UserScreen: FC<UserScreenProps> = observer(function UserScreen({
                     disabled={secret}
                     onPress={toggleLegacy}
                   />
-                }
-              />
-            )}
+                ) : (
+                  <TouchableOpacity
+                    onPress={() =>
+                      Alert.alert("Blinded DM automatically enabled when you use private follow")
+                    }
+                  >
+                    <HelpCircleIcon width={20} height={20} color={colors.palette.cyan500} />
+                  </TouchableOpacity>
+                )
+              }
+            />
             <ListItem
               text="Hide this contact (private follow)"
               bottomSeparator={true}