ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-13 08:38:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Author: performance

Browse Source
This commit is contained in:
Liam Fitzgerald 2021-06-17 12:34:18 +10:00
parent 90c9c2ee87
commit 4363801532
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/interface/src/logic/state/contact.ts
View File

@ -1,4 +1,4 @@
import { Contact, Patp, Rolodex } from '@urbit/api';
import { Contact, deSig, Patp, Rolodex } from '@urbit/api';
import { useCallback } from 'react';
import _ from 'lodash';
import { reduce, reduceNacks } from '../reducers/contact-update';
@ -43,7 +43,7 @@ const useContactState = createState<ContactState>(
export function useContact(ship: string) {
return useContactState(
useCallback(s => s.contacts[ship] as Contact | null, [ship])
useCallback(s => s.contacts[`~${deSig(ship)}`] as Contact | null, [ship])
);
}

21
pkg/interface/src/views/components/Author.tsx
View File

@ -3,9 +3,9 @@ import moment from 'moment';
import React, { ReactElement, ReactNode } from 'react';
import { Sigil } from '~/logic/lib/sigil';
import { useCopy } from '~/logic/lib/useCopy';
import { cite, deSig, useShowNickname, uxToHex } from '~/logic/lib/util';
import useContactState from '~/logic/state/contact';
import useLocalState from '~/logic/state/local';
import { cite, useShowNickname, uxToHex } from '~/logic/lib/util';
import { useContact } from '~/logic/state/contact';
import { useDark } from '~/logic/state/join';
import useSettingsState, { selectCalmState } from '~/logic/state/settings';
import { PropFunc } from '~/types';
import ProfileOverlay from './ProfileOverlay';
@ -23,7 +23,7 @@ export interface AuthorProps {
}
// eslint-disable-next-line max-lines-per-function
export default function Author(props: AuthorProps & PropFunc<typeof Box>): ReactElement {
function Author(props: AuthorProps & PropFunc<typeof Box>): ReactElement {
const {
ship = '',
date,
@ -41,16 +41,9 @@ export default function Author(props: AuthorProps & PropFunc<typeof Box>): React
const size = props.size || 16;
const sigilPadding = props.sigilPadding || 2;
const osDark = useLocalState(state => state.dark);
const dark = useDark();
const theme = useSettingsState(s => s.display.theme);
const dark = theme === 'dark' || (theme === 'auto' && osDark);
let contact;
const contacts = useContactState(state => state.contacts);
if (contacts) {
contact = `~${deSig(ship)}` in contacts ? contacts[`~${deSig(ship)}`] : null;
}
const contact = useContact(ship);
const color = contact?.color ? `#${uxToHex(contact?.color)}` : dark ? '#000000' : '#FFFFFF';
const showNickname = useShowNickname(contact);
const { hideAvatars } = useSettingsState(selectCalmState);
@ -124,3 +117,5 @@ export default function Author(props: AuthorProps & PropFunc<typeof Box>): React
</Row>
);
}
export default React.memo(Author);