nostr/nostros
1
0
Fork 0
mirror of https://github.com/KoalaSat/nostros.git synced 2024-09-28 22:30:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix list (#414)

Browse Source
This commit is contained in:
KoalaSat 2023-03-10 18:51:11 +00:00 committed by GitHub
commit ce599b5eb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/Pages/ProfileLoadPage/FirstStep/index.tsx
View File

@ -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()
}
}

4
frontend/Pages/ProfileLoadPage/SecondStep/index.tsx
View File

@ -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')}>

2
frontend/Pages/ProfileLoadPage/ThirdStep/index.tsx
View File

@ -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,

8
frontend/Pages/ProfileLoadPage/index.tsx
View File

@ -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'])
}, []),
)

39
frontend/Pages/RelaysPage/index.tsx
View File

@ -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}
/>