diff --git a/frontend/Components/NoteCard/index.tsx b/frontend/Components/NoteCard/index.tsx index fba680c..a929da7 100644 --- a/frontend/Components/NoteCard/index.tsx +++ b/frontend/Components/NoteCard/index.tsx @@ -164,7 +164,14 @@ export const NoteCard: React.FC = ({ numberOfLines={numberOfLines} /> )} - {showRepostPreview && repost && } + {showRepostPreview && repost && ( + + )} ) diff --git a/frontend/Contexts/AppContext.tsx b/frontend/Contexts/AppContext.tsx index 210de17..a4ef449 100644 --- a/frontend/Contexts/AppContext.tsx +++ b/frontend/Contexts/AppContext.tsx @@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react' import { QuickSQLiteConnection } from 'react-native-quick-sqlite' import { initDatabase } from '../Functions/DatabaseFunctions' import SInfo from 'react-native-sensitive-info' +import { Linking } from 'react-native' export interface AppContextProps { init: () => void @@ -28,6 +29,7 @@ export const AppContextProvider = ({ children }: AppContextProviderProps): JSX.E setDatabase(db) SInfo.getItem('publicKey', {}).then((value) => { setLoadingDb(false) + // Linking.addEventListener('url', this.handleOpenURL); }) } diff --git a/frontend/Locales/es.json b/frontend/Locales/es.json index 29213eb..f8bc734 100644 --- a/frontend/Locales/es.json +++ b/frontend/Locales/es.json @@ -139,6 +139,8 @@ "notifications": { "add": "Relay conectado", "remove": "Relay borrado", + "active": "Relay acivado.", + "desactive": "Relay desactivado.", "badFormat": "La URL del relay no tiene el formato adecuado." } }, diff --git a/frontend/Locales/ru.json b/frontend/Locales/ru.json index cfc8537..6a2d73a 100644 --- a/frontend/Locales/ru.json +++ b/frontend/Locales/ru.json @@ -138,6 +138,8 @@ "notifications": { "add": "Relay connected.", "remove": "Relay removed.", + "active": "Relay acivado.", + "desactive": "Relay desactivado.", "badFormat": "Relay URL has a bad format." } }, diff --git a/frontend/Pages/AboutPage/index.tsx b/frontend/Pages/AboutPage/index.tsx index 2fb0e98..fb67640 100644 --- a/frontend/Pages/AboutPage/index.tsx +++ b/frontend/Pages/AboutPage/index.tsx @@ -81,6 +81,7 @@ export const AboutPage: React.FC = () => { data={items} renderItem={renderItem} /> + // DeviceInfo.getVersion() ) } diff --git a/frontend/Pages/ContactsFeed/index.tsx b/frontend/Pages/ContactsFeed/index.tsx index 8dfa769..b4a5e59 100644 --- a/frontend/Pages/ContactsFeed/index.tsx +++ b/frontend/Pages/ContactsFeed/index.tsx @@ -227,7 +227,7 @@ export const ContactsFeed: React.FC = () => { ItemSeparatorComponent={Divider} showsVerticalScrollIndicator={false} /> - {following.length >= 10 && } + {pageSize < following.length && } ) : ( @@ -265,7 +265,7 @@ export const ContactsFeed: React.FC = () => { showsVerticalScrollIndicator={false} /> - {followers.length >= 10 && } + {pageSize < followers.length && } ) : ( diff --git a/frontend/Pages/ProfileLoadPage/index.tsx b/frontend/Pages/ProfileLoadPage/index.tsx index 9901610..5e46c1e 100644 --- a/frontend/Pages/ProfileLoadPage/index.tsx +++ b/frontend/Pages/ProfileLoadPage/index.tsx @@ -23,9 +23,12 @@ export const ProfileLoadPage: React.FC = () => { useFocusEffect( React.useCallback(() => { - if (publicKey && relayPoolReady) loadMeta() + if (publicKey && relayPoolReady) { + loadMeta() + loadPets() + } - return () => relayPool?.unsubscribe(['profile-load-notes']) + return () => relayPool?.unsubscribe(['profile-load-notes', 'profile-load-meta-pets']) }, []), ) @@ -70,7 +73,7 @@ export const ProfileLoadPage: React.FC = () => { { kinds: [Kind.Text], authors, - since: getUnixTime(new Date()) - 86400, + since: getUnixTime(new Date()) - 43200, }, { kinds: [Kind.Metadata], diff --git a/frontend/Pages/RelaysPage/index.tsx b/frontend/Pages/RelaysPage/index.tsx index 8376d80..2d058fc 100644 --- a/frontend/Pages/RelaysPage/index.tsx +++ b/frontend/Pages/RelaysPage/index.tsx @@ -108,7 +108,7 @@ export const RelaysPage: React.FC = () => { return ( - {myRelays && ( + {myRelays.length > 0 && ( <> {t('relaysPage.myList')}