fix: merge conflict

This commit is contained in:
Alejandro Gomez 2023-01-25 10:37:54 +01:00
parent e56031411d
commit 7a9cf931c8
No known key found for this signature in database
GPG Key ID: 4DF39E566658C817

View File

@ -8,7 +8,7 @@ import LNURLTip from "Element/LNURLTip";
const ZapButton = ({ pubkey, svc }: { pubkey?: HexKey, svc?: string }) => {
const profile = useProfile(pubkey)?.get(pubkey ?? "");
const profile = useUserProfile(pubkey!)
const [zap, setZap] = useState(false);
const service = svc ?? (profile?.lud16 || profile?.lud06);