From 39266b79337a79474b29ba30df0df37142545e7d Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Tue, 17 Jan 2023 15:48:34 +0100
Subject: [PATCH] Fix bugs

---
 .../app/src/main/java/com/nostros/classes/Websocket.java | 9 +++++++++
 frontend/Components/MenuItems/index.tsx                  | 6 +++---
 frontend/Pages/HomeFeed/index.tsx                        | 2 +-
 frontend/Pages/NotificationsFeed/index.tsx               | 9 ++++-----
 frontend/Pages/ProfileLoadPage/index.tsx                 | 8 +++++++-
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/android/app/src/main/java/com/nostros/classes/Websocket.java b/android/app/src/main/java/com/nostros/classes/Websocket.java
index c18b2a2..97f4b66 100644
--- a/android/app/src/main/java/com/nostros/classes/Websocket.java
+++ b/android/app/src/main/java/com/nostros/classes/Websocket.java
@@ -13,6 +13,7 @@ import com.neovisionaries.ws.client.WebSocketFrame;
 import com.nostros.modules.DatabaseModule;
 
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
@@ -40,6 +41,14 @@ public class Websocket {
             }
         }
         webSocket.sendText(message);
+        JSONArray jsonArray = null;
+        try {
+            jsonArray = new JSONArray(message);
+            JSONObject data = jsonArray.getJSONObject(2);
+            database.saveEvent(data, pubKey);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 
     public void disconnect() {
diff --git a/frontend/Components/MenuItems/index.tsx b/frontend/Components/MenuItems/index.tsx
index a2f8e13..8a05dd5 100644
--- a/frontend/Components/MenuItems/index.tsx
+++ b/frontend/Components/MenuItems/index.tsx
@@ -61,19 +61,19 @@ export const MenuItems: React.FC = () => {
         {nPub && (
           <Card style={styles.cardContainer}>
             <Card.Content style={styles.cardContent}>
-              <TouchableRipple onPress={() => navigate('Profile', { pubKey: user?.id })}>
+              <TouchableRipple onPress={() => navigate('Profile', { pubKey: publicKey })}>
                 <View style={styles.cardContent}>
                   <View style={styles.cardAvatar}>
                     <NostrosAvatar
                       name={user?.name}
-                      pubKey={user?.id ?? ''}
+                      pubKey={publicKey ?? ''}
                       src={user?.picture}
                       lud06={user?.lnurl}
                     />
                   </View>
                   <View>
                     <Text variant='titleMedium'>{user?.name}</Text>
-                    <Text>{formatPubKey(user?.id ?? '')}</Text>
+                    <Text>{formatPubKey(publicKey ?? '')}</Text>
                   </View>
                 </View>
               </TouchableRipple>
diff --git a/frontend/Pages/HomeFeed/index.tsx b/frontend/Pages/HomeFeed/index.tsx
index 20b2169..639efce 100644
--- a/frontend/Pages/HomeFeed/index.tsx
+++ b/frontend/Pages/HomeFeed/index.tsx
@@ -105,7 +105,7 @@ export const HomeFeed: React.FC<HomeFeedProps> = ({ jumpTo }) => {
         setNotes(notes)
         setRefreshing(false)
         if (notes.length > 0) {
-          relayPool?.subscribe('homepage-contacts-meta', [
+          relayPool?.subscribe('homepage-reactions', [
             {
               kinds: [EventKind.reaction, EventKind.textNote, EventKind.recommendServer],
               '#e': notes.map((note) => note.id ?? ''),
diff --git a/frontend/Pages/NotificationsFeed/index.tsx b/frontend/Pages/NotificationsFeed/index.tsx
index 500add5..2cc4285 100644
--- a/frontend/Pages/NotificationsFeed/index.tsx
+++ b/frontend/Pages/NotificationsFeed/index.tsx
@@ -60,7 +60,7 @@ export const NotificationsFeed: React.FC = () => {
   const subscribeNotes: () => void = async () => {
     if (!database || !publicKey) return
 
-    relayPool?.subscribe('mentions-user', [
+    relayPool?.subscribe('notification-user', [
       {
         kinds: [EventKind.textNote],
         '#p': [publicKey],
@@ -80,15 +80,14 @@ export const NotificationsFeed: React.FC = () => {
         setNotes(notes)
         setRefreshing(false)
         if (notes.length > 0) {
-          const missingDataNotes = notes.map((note) => note.pubkey)
-          relayPool?.subscribe('mentions-answers', [
+          relayPool?.subscribe('notification-answers', [
             {
               kinds: [EventKind.reaction, EventKind.textNote, EventKind.recommendServer],
               '#e': notes.map((note) => note.id ?? ''),
             },
             {
               kinds: [EventKind.meta],
-              authors: missingDataNotes,
+              authors: notes.filter((note) => note.name !== undefined).map((note) => note.pubkey),
             },
           ])
         }
@@ -151,7 +150,7 @@ export const NotificationsFeed: React.FC = () => {
         </ScrollView>
       ) : (
         <View style={styles.blank}>
-          <MaterialCommunityIcons name='message-outline' size={64} style={styles.center} />
+          <MaterialCommunityIcons name='bell-outline' size={64} style={styles.center} />
           <Text variant='headlineSmall' style={styles.center}>
             {t('notificationsFeed.emptyTitle')}
           </Text>
diff --git a/frontend/Pages/ProfileLoadPage/index.tsx b/frontend/Pages/ProfileLoadPage/index.tsx
index 0a5cb85..334c766 100644
--- a/frontend/Pages/ProfileLoadPage/index.tsx
+++ b/frontend/Pages/ProfileLoadPage/index.tsx
@@ -72,7 +72,13 @@ export const ProfileLoadPage: React.FC = () => {
         style={styles.snackbar}
         visible
         onDismiss={() => {}}
-        action={{ label: t('profileLoadPage.relays') ?? '', onPress: () => navigate('Relays') }}
+        action={{
+          label: t('profileLoadPage.relays') ?? '',
+          onPress: () => {
+            relayPool?.unsubscribeAll()
+            navigate('Relays')
+          },
+        }}
       >
         {t('profileLoadPage.relaysDescripion')}
       </Snackbar>