Merge pull request #67 from v0l/minifix
fix: dont display display_name as nip user when username is default
This commit is contained in:
commit
fd0ce62428
@ -39,7 +39,7 @@ export function useIsVerified(nip05, pubkey) {
|
|||||||
return { isVerified, couldNotVerify: isError || cantVerify }
|
return { isVerified, couldNotVerify: isError || cantVerify }
|
||||||
}
|
}
|
||||||
|
|
||||||
const Nip05 = ({ nip05, pubkey, defaultUsername = '' }) => {
|
const Nip05 = ({ nip05, pubkey }) => {
|
||||||
const [name, domain] = nip05 ? nip05.split('@') : []
|
const [name, domain] = nip05 ? nip05.split('@') : []
|
||||||
const isDefaultUser = name === '_'
|
const isDefaultUser = name === '_'
|
||||||
const { isVerified, couldNotVerify } = useIsVerified(nip05, pubkey)
|
const { isVerified, couldNotVerify } = useIsVerified(nip05, pubkey)
|
||||||
@ -47,7 +47,7 @@ const Nip05 = ({ nip05, pubkey, defaultUsername = '' }) => {
|
|||||||
return (
|
return (
|
||||||
<div className="flex nip05" onClick={(ev) => ev.stopPropagation()}>
|
<div className="flex nip05" onClick={(ev) => ev.stopPropagation()}>
|
||||||
<div className="nick">
|
<div className="nick">
|
||||||
{isDefaultUser ? defaultUsername : name}
|
{!isDefaultUser && name}
|
||||||
</div>
|
</div>
|
||||||
<div className={`domain text-gradient`} data-domain={domain?.toLowerCase()}>
|
<div className={`domain text-gradient`} data-domain={domain?.toLowerCase()}>
|
||||||
{domain}
|
{domain}
|
||||||
|
@ -9,7 +9,6 @@ import Text from "./Text";
|
|||||||
import { eventLink, hexToBech32 } from "../Util";
|
import { eventLink, hexToBech32 } from "../Util";
|
||||||
import NoteFooter from "./NoteFooter";
|
import NoteFooter from "./NoteFooter";
|
||||||
import NoteTime from "./NoteTime";
|
import NoteTime from "./NoteTime";
|
||||||
import Nip05 from "./Nip05";
|
|
||||||
|
|
||||||
export default function Note(props) {
|
export default function Note(props) {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
@ -30,13 +30,7 @@ export default function ProfileImage({ pubkey, subHeader, showUsername = true, c
|
|||||||
<Link key={pubkey} to={link ?? profileLink(pubkey)}>
|
<Link key={pubkey} to={link ?? profileLink(pubkey)}>
|
||||||
<div className="profile-name">
|
<div className="profile-name">
|
||||||
<div>{name}</div>
|
<div>{name}</div>
|
||||||
{user?.nip05 && (
|
{user?.nip05 && <Nip05 nip05={user.nip05} pubkey={user.pubkey} />}
|
||||||
<Nip05
|
|
||||||
nip05={user.nip05}
|
|
||||||
pubkey={user.pubkey}
|
|
||||||
defaultUsername={user.display_name || user.name}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
{subHeader ? <>{subHeader}</> : null}
|
{subHeader ? <>{subHeader}</> : null}
|
||||||
|
@ -75,6 +75,7 @@ const UsersSlice = createSlice({
|
|||||||
nip05: x.nip05,
|
nip05: x.nip05,
|
||||||
picture: x.picture,
|
picture: x.picture,
|
||||||
})
|
})
|
||||||
|
window.localStorage.setItem(`user:${x.pubkey}`, JSON.stringify(x));
|
||||||
|
|
||||||
state.users = {
|
state.users = {
|
||||||
...state.users
|
...state.users
|
||||||
|
Loading…
Reference in New Issue
Block a user