-
setCustomAmount(parseInt(e.target.value))} />
-
selectAmount(customAmount!)}>Confirm
+
+ setCustomAmount(parseInt(e.target.value))}
+ />
+
);
}
@@ -182,22 +210,36 @@ export default function LNURLTip(props: LNURLTipProps) {
if (invoice) return null;
return (
<>
-
{metadata?.description ?? service}
+
Zap amount in sats
+
+ {serviceAmounts.map(a =>
+ selectAmount(a)}>
+ {emojis[a] && <>{emojis[a]} > }
+ {formatShort(a)}
+
+ )}
+
+ {payService && custom()}
- {(payService?.commentAllowed ?? 0) > 0 ?
- setComment(e.target.value)} /> : null}
+ {(payService?.commentAllowed ?? 0) > 0 &&
+ setComment(e.target.value)}
+ />
+ }
-
- {serviceAmounts.map(a => selectAmount(a)}>
- {a.toLocaleString()}
- )}
- {payService ?
- selectAmount(-1)}>
- Custom
- : null}
-
- {amount === -1 ? custom() : null}
- {(amount ?? 0) > 0 &&
}
+ {(amount ?? 0) > 0 && (
+
+ )}
>
)
}
@@ -208,22 +250,20 @@ export default function LNURLTip(props: LNURLTipProps) {
return (
<>
- {props.notice &&
{props.notice}}
-
-
- {pr && (
- <>
-
-
-
-
-
-
- >
- )}
-
+ {props.notice &&
{props.notice}}
+
+
+ {pr && (
+ <>
+
+
+
+
+ >
+ )}
+
>
)
@@ -232,24 +272,46 @@ export default function LNURLTip(props: LNURLTipProps) {
function successAction() {
if (!success) return null;
return (
- <>
-
{success?.description ?? "Paid!"}
- {success.url ?
{success.url} : null}
- >
+
)
}
- const defaultTitle = payService?.nostrPubkey ? "⚡️ Send Zap!" : "⚡️ Send sats";
+ const defaultTitle = payService?.nostrPubkey ? "Send zap" : "Send sats";
+ const title = target ? `${defaultTitle} to ${target}` : defaultTitle
if (!show) return null;
return (
-
- e.stopPropagation()}>
-
{props.title || defaultTitle}
- {invoiceForm()}
- {error ?
{error}
: null}
- {payInvoice()}
- {successAction()}
-
+
+ e.stopPropagation()}>
+
+
+
+
+ {author &&
}
+
+ {props.title || title}
+
+
+ {invoiceForm()}
+ {error &&
{error}
}
+ {payInvoice()}
+ {successAction()}
+
)
}
diff --git a/src/Element/NoteCreator.css b/src/Element/NoteCreator.css
index ad0a7d62..98ac2ce4 100644
--- a/src/Element/NoteCreator.css
+++ b/src/Element/NoteCreator.css
@@ -12,6 +12,7 @@
}
.note-creator textarea {
+ border: none;
outline: none;
resize: none;
background-color: var(--note-bg);
diff --git a/src/Element/NoteFooter.tsx b/src/Element/NoteFooter.tsx
index e11be6ce..2da126e1 100644
--- a/src/Element/NoteFooter.tsx
+++ b/src/Element/NoteFooter.tsx
@@ -268,7 +268,14 @@ export default function NoteFooter(props: NoteFooterProps) {
show={reply}
setShow={setReply}
/>
- setTip(false)} show={tip} author={author?.pubkey} note={ev.Id} />
+ setTip(false)}
+ show={tip}
+ author={author?.pubkey}
+ target={author?.display_name || author?.name}
+ note={ev.Id}
+ />
diff --git a/src/Element/Tabs.css b/src/Element/Tabs.css
index 2b854d91..769c1a72 100644
--- a/src/Element/Tabs.css
+++ b/src/Element/Tabs.css
@@ -12,7 +12,8 @@
}
.tab {
- border: 1px solid var(--gray-secondary);
+ color: var(--font-tertiary-color);
+ border: 1px solid var(--font-tertiary-color);
border-radius: 16px;
text-align: center;
font-weight: 600;
@@ -21,7 +22,6 @@
font-weight: 600;
font-size: 14px;
line-height: 17px;
- color: #A3A3A3;
margin-right: 12px;
}
diff --git a/src/Element/Zap.css b/src/Element/Zap.css
index 5de0871b..cb66101e 100644
--- a/src/Element/Zap.css
+++ b/src/Element/Zap.css
@@ -52,7 +52,7 @@
margin-top: 8px;
display: flex;
flex-direction: row;
- margin-left: 52px;
+ margin-left: 56px;
}
.note.thread-root .zaps-summary {
@@ -70,8 +70,8 @@
}
.top-zap .avatar {
- width: 21px;
- height: 21px;
+ width: 18px;
+ height: 18px;
}
.top-zap .nip05 {
diff --git a/src/Element/ZapButton.tsx b/src/Element/ZapButton.tsx
index 4195e25a..a48fe1ac 100644
--- a/src/Element/ZapButton.tsx
+++ b/src/Element/ZapButton.tsx
@@ -19,7 +19,7 @@ const ZapButton = ({ pubkey, svc }: { pubkey?: HexKey, svc?: string }) => {
setZap(true)}>
-
setZap(false)} author={pubkey} />
+ setZap(false)} author={pubkey} />
>
)
}
diff --git a/src/Icons/Close.tsx b/src/Icons/Close.tsx
new file mode 100644
index 00000000..0c038328
--- /dev/null
+++ b/src/Icons/Close.tsx
@@ -0,0 +1,11 @@
+import IconProps from "./IconProps";
+
+const Close = (props: IconProps) => {
+ return (
+
+ )
+}
+
+export default Close
diff --git a/src/Icons/Reply.tsx b/src/Icons/Reply.tsx
index fa57e467..3d9cf0ba 100644
--- a/src/Icons/Reply.tsx
+++ b/src/Icons/Reply.tsx
@@ -1,8 +1,10 @@
+import IconProps from "./IconProps";
+
const Reply = () => {
return (
-
+
)
}
diff --git a/src/Pages/ProfilePage.tsx b/src/Pages/ProfilePage.tsx
index 2310c079..b77fa060 100644
--- a/src/Pages/ProfilePage.tsx
+++ b/src/Pages/ProfilePage.tsx
@@ -111,7 +111,13 @@ export default function ProfilePage() {
)}
-