Merge branch 'main' into main

frontend/Locales/de.json

@@ -134,6 +134,8 @@
         "contactRemoved": "Abo wurde entfernt",
         "contactUnblocked": "Profile unblocked."
       },
+      "emptyTitleBlocked": "You have no blocked profiles", 
+      "emptyDescriptionBlocked": "You can always block a someone on the profile view.",
       "emptyTitleFollowing": "Du folgst niemandem",
       "emptyDescriptionFollowing": "Folge anderen, und sieh hier was sie posten",
       "emptyButtonFollowing": "Folge öffentlichen Schlüsseln",

frontend/Locales/en.json

@@ -42,7 +42,7 @@
       "searchingProfile": "Searching for your profile",
       "foundProfile": "Profile found",
       "foundContacts": "{{contactsCount}} contacts found",
-      "storing": "Storing {{lastEventId}} on database."
+      "storing": "Event {{lastEventId}} stored on database."
     },
     "sendPage": {
       "isContact": "Following",
@@ -139,6 +139,8 @@
       "emptyButtonFollowing": "Paste public key",
       "emptyTitleFollower": "You have no followers",
       "emptyDescriptionFollower": "Share your public key so people can start following you.",
+      "emptyTitleBlocked": "You have no blocked profiles", 
+      "emptyDescriptionBlocked": "You can always block a someone on the profile view.",
       "emptyButtonFollower": "Copy public key",
       "cancel": "Cancel",
       "addContact": "Add contact",

frontend/Locales/es.json

@@ -42,7 +42,7 @@
       "searchingProfile": "Buscando tu perfil",
       "foundProfile": "Perfil encontrado",
       "foundContacts": "{{contactsCount}} contactos encontrados",
-      "storing": "Guardando {{lastEventId}} en base de datos."
+      "storing": "Evento {{lastEventId}} guardado en base de datos."
     },
     "sendPage": {
       "isContact": "Siguiendo",
@@ -134,6 +134,8 @@
         "contactRemoved": "Has dejado de seguir a un perfil",
         "contactUnblocked": "Perfil desbloqueado."
       },
+      "emptyTitleBlocked": "No tienes perfiles bloqueado", 
+      "emptyDescriptionBlocked": "Siempre puede bloquear a alguien en su vista de perfil.",
       "emptyTitleFollowing": "No sigues a nadie",
       "emptyDescriptionFollowing": "Sigue otros perfiles para ver contenido aquí.",
       "emptyButtonFollowing": "Pegar clave pública",

frontend/Locales/fr.json

@@ -42,7 +42,7 @@
       "searchingProfile": "A la recherche de votre profil",
       "foundProfile": "Profil trouvé",
       "foundContacts": "{{contactsCount}} contacts trouvés",
-      "storing": "Storing {{lastEventId}} on database."
+      "storing": "Event {{lastEventId}} stored on database."
     },
     "sendPage": {
       "isContact": "Abonné",
@@ -135,6 +135,8 @@
         "contactRemoved": "Vous ne suivez plus ce profil",
         "contactUnblocked": "Profile unblocked."
       },
+      "emptyTitleBlocked": "You have no blocked profiles", 
+      "emptyDescriptionBlocked": "You can always block a someone on the profile view.",
       "emptyTitleFollowing": "Vous ne suivez personne",
       "emptyDescriptionFollowing": "Suivez les autres profils pour voir le contenu ici.",
       "emptyButtonFollowing": "Coller la clé publique",

frontend/Locales/ru.json

@@ -42,7 +42,7 @@
       "searchingProfile": "Ищем Ваш профиль.",
       "foundProfile": "Профиль найден.",
       "foundContacts": "{{contactsCount}} контакта(ов) найдено",
-      "storing": "Storing {{lastEventId}} on database."
+      "storing": "Event {{lastEventId}} stored on database."
     },
     "sendPage": {
       "isContact": "Подписаны",
@@ -134,6 +134,8 @@
         "contactRemoved": "Вы отписались.",
         "contactUnblocked": "Profile unblocked."
       },
+      "emptyTitleBlocked": "You have no blocked profiles", 
+      "emptyDescriptionBlocked": "You can always block a someone on the profile view.",
       "emptyTitleFollowing": "Вы ни на кого не подписаны",
       "emptyDescriptionFollowing": "Подпишитесь на другие профили, чтобы увидеть их заметки",
       "emptyButtonFollowing": "Вставить публичный ключ",

frontend/Locales/zhCn.json

@@ -41,7 +41,7 @@
       "searchingProfile": "搜索用户",
       "foundProfile": "已找到的用户",
       "foundContacts": "已找到 {{contactsCount}} 个联系人",
-      "storing": "Storing {{lastEventId}} on database."
+      "storing": "Event {{lastEventId}} stored on database."
     },
     "sendPage": {
       "isContact": "正在关注",
@@ -132,6 +132,8 @@
         "contactRemoved": "已取消关注",
         "contactUnblocked": "Profile unblocked."
       },
+      "emptyTitleBlocked": "You have no blocked profiles", 
+      "emptyDescriptionBlocked": "You can always block a someone on the profile view.",
       "emptyTitleFollowing": "您还没有关注任何用户",
       "emptyDescriptionFollowing": "关注一些用户以查看内容",
       "emptyButtonFollowing": "粘贴公钥",

frontend/Pages/ProfileLoadPage/index.tsx

@@ -6,7 +6,6 @@ import { UserContext } from '../../Contexts/UserContext'
 import { getUsers, User } from '../../Functions/DatabaseFunctions/Users'
 import { useTranslation } from 'react-i18next'
 import getUnixTime from 'date-fns/getUnixTime'
-import debounce from 'lodash.debounce'
 import { DeviceEventEmitter, StyleSheet, View } from 'react-native'
 import Logo from '../../Components/Logo'
 import { Button, Text, useTheme } from 'react-native-paper'
@@ -29,10 +28,7 @@ export const ProfileLoadPage: React.FC = () => {
       DeviceEventEmitter.addListener('WebsocketEvent', (event: WebsocketEvent) =>
         setLastEventId(event.eventId),
       )
-      debounce(() => {
-        loadMeta()
-        reloadUser()
-      }, 1000)
+      setTimeout(() => loadMeta(), 1000)
       return () =>
         relayPool?.unsubscribe([
           'profile-load-meta',
@@ -55,8 +51,8 @@ export const ProfileLoadPage: React.FC = () => {
   }, [profileFound, publicKey, relayPoolReady])
 
   useEffect(() => {
-    if (publicKey && relayPoolReady) loadMeta()
-  }, [publicKey, relayPoolReady])
+    setTimeout(loadMeta, 1000)
+  }, [profileFound, publicKey, relayPoolReady])
 
   const loadMeta: () => void = () => {
     if (publicKey && relayPoolReady) {
@@ -66,6 +62,8 @@ export const ProfileLoadPage: React.FC = () => {
           authors: [publicKey],
         },
       ])
+    } else {
+      setTimeout(() => loadMeta(), 1000)
     }
   }
 
@@ -103,9 +101,11 @@ export const ProfileLoadPage: React.FC = () => {
         <Text variant='titleMedium' style={styles.center}>
           {t('profileLoadPage.foundContacts', { contactsCount })}
         </Text>
-        <Text variant='titleMedium' style={styles.center}>
-          {t('profileLoadPage.storing', { lastEventId: formatId(lastEventId) })}
-        </Text>
+        {lastEventId && (
+          <Text variant='titleMedium' style={styles.center}>
+            {t('profileLoadPage.storing', { lastEventId: formatId(lastEventId) })}
+          </Text>
+        )}
         <Button mode='contained' onPress={() => setUserState('ready')}>
           {t('profileLoadPage.home')}
         </Button>

package.json

@@ -50,7 +50,7 @@
     "react-native-qrcode-svg": "^6.1.2",
     "react-native-quick-sqlite": "^7.0.0",
     "react-native-raw-bottom-sheet": "^2.2.0",
-    "react-native-reanimated": "^2.14.2",
+    "react-native-reanimated": "^2.14.4",
     "react-native-safe-area-context": "^4.4.1",
     "react-native-screens": "^3.19.0",
     "react-native-securerandom": "^1.0.1",
@@ -84,7 +84,7 @@
     "@types/uuid": "^9.0.0",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
     "babel-jest": "^29.3.1",
-    "eslint": "^8.31.0",
+    "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-config-standard-with-typescript": "^24.0.0",
     "eslint-import-resolver-typescript": "^3.5.3",

yarn.lock

@@ -4005,10 +4005,10 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^8.31.0:
-  version "8.31.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.31.0.tgz#75028e77cbcff102a9feae1d718135931532d524"
-  integrity sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==
+eslint@^8.33.0:
+  version "8.33.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.33.0.tgz#02f110f32998cb598c6461f24f4d306e41ca33d7"
+  integrity sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==
   dependencies:
     "@eslint/eslintrc" "^1.4.1"
     "@humanwhocodes/config-array" "^0.11.8"
@@ -7262,10 +7262,10 @@ react-native-raw-bottom-sheet@^2.2.0:
   resolved "https://registry.yarnpkg.com/react-native-raw-bottom-sheet/-/react-native-raw-bottom-sheet-2.2.0.tgz#d11dabb86aadb014273767ef7b554924b13633c5"
   integrity sha512-qL4JKIqvbcVxbkKzeh51hjV7suoJN3ouxzvLmOg0FBUV1yiJAfEbacjQdtRCI6+OU5pyGFBIifLsTXcFDwHggg==
 
-react-native-reanimated@^2.14.2:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.14.2.tgz#7f20f01052ea4902e320be8725d55b40b1d21d62"
-  integrity sha512-zj05BBafk38rE78PhHc6q0vg9M4WeJY/RExHUGFiP1miJyyAaJzs2jLQR+HY0zbutCE+/yNJyOE3dca2BslsGg==
+react-native-reanimated@^2.14.4:
+  version "2.14.4"
+  resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.14.4.tgz#3fa3da4e7b99f5dfb28f86bcf24d9d1024d38836"
+  integrity sha512-DquSbl7P8j4SAmc+kRdd75Ianm8G+IYQ9T4AQ6lrpLVeDkhZmjWI0wkutKWnp6L7c5XNVUrFDUf69dwETLCItQ==
   dependencies:
     "@babel/plugin-transform-object-assign" "^7.16.7"
     "@babel/preset-typescript" "^7.16.7"