From ed5c5b9de9cd766e455fdf151125b86fa0e76b5a Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Fri, 10 Mar 2023 19:50:49 +0100
Subject: [PATCH] fix list

---
 .../Pages/ProfileLoadPage/FirstStep/index.tsx |  4 +-
 .../ProfileLoadPage/SecondStep/index.tsx      |  4 +-
 .../Pages/ProfileLoadPage/ThirdStep/index.tsx |  2 +-
 frontend/Pages/ProfileLoadPage/index.tsx      |  8 +---
 frontend/Pages/RelaysPage/index.tsx           | 39 +++++++++----------
 5 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/frontend/Pages/ProfileLoadPage/FirstStep/index.tsx b/frontend/Pages/ProfileLoadPage/FirstStep/index.tsx
index de5e63c..130e4a5 100644
--- a/frontend/Pages/ProfileLoadPage/FirstStep/index.tsx
+++ b/frontend/Pages/ProfileLoadPage/FirstStep/index.tsx
@@ -74,9 +74,7 @@ export const FirstStep: React.FC<FirstStepProps> = ({ nextStep }) => {
       relays.forEach((relay) => {
         removeRelayItem(relay)
       })
-      metadata.tags.forEach(
-        async (tag) => await addRelayItem({ url: tag[1], paid: tag[3] === 'paid' ? 1 : 0 }),
-      )
+      metadata.tags.forEach(async (tag) => await addRelayItem({ url: tag[1] }))
       nextStep()
     }
   }
diff --git a/frontend/Pages/ProfileLoadPage/SecondStep/index.tsx b/frontend/Pages/ProfileLoadPage/SecondStep/index.tsx
index 4c229c9..e92cc2b 100644
--- a/frontend/Pages/ProfileLoadPage/SecondStep/index.tsx
+++ b/frontend/Pages/ProfileLoadPage/SecondStep/index.tsx
@@ -77,7 +77,7 @@ export const SecondStep: React.FC<SecondStepProps> = ({ nextStep }) => {
         if (results.length > 0) {
           setContactsCount(results.filter((user) => user.contact).length)
           const authors = [...results.map((user: User) => user.id)]
-          relayPool?.subscribe('profile-load-notes', [
+          relayPool?.subscribe('profile-load-contacts', [
             {
               kinds: [Kind.Metadata, 10002],
               authors,
@@ -156,7 +156,7 @@ export const SecondStep: React.FC<SecondStepProps> = ({ nextStep }) => {
         </View>
       </View>
       <View style={styles.buttons}>
-        <Button mode='contained' onPress={nextStep} disabled={contactsCount === undefined}>
+        <Button mode='contained' onPress={nextStep} disabled={!contactsCount}>
           {t('profileLoadPage.nextStep')}
         </Button>
         <Button mode='outlined' onPress={() => setUserState('ready')}>
diff --git a/frontend/Pages/ProfileLoadPage/ThirdStep/index.tsx b/frontend/Pages/ProfileLoadPage/ThirdStep/index.tsx
index 8b53192..fd01d49 100644
--- a/frontend/Pages/ProfileLoadPage/ThirdStep/index.tsx
+++ b/frontend/Pages/ProfileLoadPage/ThirdStep/index.tsx
@@ -41,7 +41,7 @@ export const ThirdStep: React.FC<ThirdStepProps> = ({ nextStep }) => {
       getUsers(database, {}).then((results) => {
         if (results.length > 0) {
           const authors = [...results.map((user: User) => user.id), publicKey]
-          relayPool?.subscribe('profile-load-relays', [
+          relayPool?.subscribe('profile-load-contacts', [
             {
               kinds: [10002],
               authors,
diff --git a/frontend/Pages/ProfileLoadPage/index.tsx b/frontend/Pages/ProfileLoadPage/index.tsx
index ad9a7f9..8f219ff 100644
--- a/frontend/Pages/ProfileLoadPage/index.tsx
+++ b/frontend/Pages/ProfileLoadPage/index.tsx
@@ -12,13 +12,7 @@ export const ProfileLoadPage: React.FC = () => {
 
   useFocusEffect(
     React.useCallback(() => {
-      return () =>
-        relayPool?.unsubscribe([
-          'profile-load-meta',
-          'profile-load-contacts',
-          'profile-load-notes',
-          'profile-load-relays',
-        ])
+      return () => relayPool?.unsubscribe(['profile-load-meta', 'profile-load-contacts'])
     }, []),
   )
 
diff --git a/frontend/Pages/RelaysPage/index.tsx b/frontend/Pages/RelaysPage/index.tsx
index 1cf98d5..3d640e2 100644
--- a/frontend/Pages/RelaysPage/index.tsx
+++ b/frontend/Pages/RelaysPage/index.tsx
@@ -136,12 +136,7 @@ export const RelaysPage: React.FC = () => {
       const activeRelays = relays.filter(
         (relay) => relay?.active && (!relay.resilient || relay.resilient < 0),
       )
-      const tags: string[][] = activeRelays.map((relay) => [
-        'r',
-        relay.url ?? '',
-        relay.mode ?? '',
-        relay.paid ? 'paid' : '',
-      ])
+      const tags: string[][] = activeRelays.map((relay) => ['r', relay.url ?? '', relay.mode ?? ''])
       const event: Event = {
         content: '',
         created_at: getUnixTime(new Date()),
@@ -267,14 +262,14 @@ export const RelaysPage: React.FC = () => {
         </View>
         <FlatList
           showsVerticalScrollIndicator={false}
-          data={relays.filter((relay) => {
-            return (
-              (!relay.resilient &&
-                (relay.paid === undefined || relay.paid < 1) &&
-                showFreeRelays) ||
-              (!relay.resilient && relay.paid !== undefined && relay.paid > 0 && showPaidRelays)
-            )
-          })}
+          data={relays
+            .filter((relay) => !relay.resilient || relay.resilient < 1)
+            .filter((relay) => {
+              return (
+                ((relay.paid === undefined || relay.paid < 1) && showFreeRelays) ||
+                (relay.paid !== undefined && relay.paid > 0 && showPaidRelays)
+              )
+            })}
           renderItem={renderItem}
           ItemSeparatorComponent={Divider}
         />
@@ -287,12 +282,16 @@ export const RelaysPage: React.FC = () => {
         <FlatList
           showsVerticalScrollIndicator={false}
           style={styles.relayList}
-          data={relays.filter((relay) => {
-            return (
-              (relay.resilient && (relay.paid === undefined || relay.paid < 1) && showFreeRelays) ??
-              (relay.resilient && relay.paid !== undefined && relay.paid > 0 && showPaidRelays)
-            )
-          })}
+          data={relays
+            .filter((relay) => relay.resilient && relay.resilient > 0)
+            .filter((relay) => {
+              return (
+                (relay.resilient &&
+                  (relay.paid === undefined || relay.paid < 1) &&
+                  showFreeRelays) ??
+                (relay.resilient && relay.paid !== undefined && relay.paid > 0 && showPaidRelays)
+              )
+            })}
           renderItem={renderItem}
           ItemSeparatorComponent={Divider}
         />