From 2c09d6af796cfde45edd03011ad1d67a863a3c01 Mon Sep 17 00:00:00 2001
From: Alejandro Gomez <alejandro@strike.me>
Date: Tue, 14 Feb 2023 00:11:51 +0100
Subject: [PATCH] send sats and show latest improvements

---
 packages/app/src/Element/SendSats.css |  8 +----
 packages/app/src/Element/SendSats.tsx | 37 +++++++++++++++------
 packages/app/src/Element/Tabs.tsx     |  2 +-
 packages/app/src/Element/Timeline.css |  8 ++++-
 packages/app/src/Element/Timeline.tsx | 47 ++++++++++++++++++++-------
 packages/app/src/index.css            |  4 +++
 6 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/packages/app/src/Element/SendSats.css b/packages/app/src/Element/SendSats.css
index 7141573d..e09d4ad0 100644
--- a/packages/app/src/Element/SendSats.css
+++ b/packages/app/src/Element/SendSats.css
@@ -64,17 +64,11 @@
 .amounts {
   display: flex;
   width: 100%;
-  overflow-x: scroll;
-  -ms-overflow-style: none; /* for Internet Explorer, Edge */
-  scrollbar-width: none; /* for Firefox */
   margin-bottom: 16px;
 }
 
-.amounts::-webkit-scrollbar {
-  display: none;
-}
-
 .sat-amount {
+  flex: 1 1 auto;
   text-align: center;
   display: inline-block;
   background-color: #2a2a2a;
diff --git a/packages/app/src/Element/SendSats.tsx b/packages/app/src/Element/SendSats.tsx
index 0ac4c874..f5abe744 100644
--- a/packages/app/src/Element/SendSats.tsx
+++ b/packages/app/src/Element/SendSats.tsx
@@ -14,7 +14,6 @@ import Modal from "Element/Modal";
 import QrCode from "Element/QrCode";
 import Copy from "Element/Copy";
 import useWebln from "Hooks/useWebln";
-import useHorizontalScroll from "Hooks/useHorizontalScroll";
 
 import messages from "./messages";
 
@@ -49,6 +48,18 @@ export interface LNURLTipProps {
   author?: HexKey;
 }
 
+function chunks(arr: any[], length: number) {
+  const result = [];
+  let idx = 0;
+  let n = arr.length / length;
+  while (n > 0) {
+    result.push(arr.slice(idx, idx + length));
+    idx += length;
+    n -= 1;
+  }
+  return result;
+}
+
 export default function LNURLTip(props: LNURLTipProps) {
   const onClose = props.onClose || (() => undefined);
   const service = props.svc;
@@ -74,7 +85,6 @@ export default function LNURLTip(props: LNURLTipProps) {
   const webln = useWebln(show);
   const { formatMessage } = useIntl();
   const publisher = useEventPublisher();
-  const horizontalScroll = useHorizontalScroll();
   const canComment = (payService?.commentAllowed ?? 0) > 0 || payService?.nostrPubkey;
 
   useEffect(() => {
@@ -100,6 +110,7 @@ export default function LNURLTip(props: LNURLTipProps) {
     }
     return [];
   }, [payService]);
+  const amountRows = useMemo(() => chunks(serviceAmounts, 3), [serviceAmounts]);
 
   const selectAmount = (a: number) => {
     setError(undefined);
@@ -204,6 +215,19 @@ export default function LNURLTip(props: LNURLTipProps) {
     }
   }
 
+  function renderAmounts(amount: number, amounts: number[]) {
+    return (
+      <div className="amounts">
+        {amounts.map(a => (
+          <span className={`sat-amount ${amount === a ? "active" : ""}`} key={a} onClick={() => selectAmount(a)}>
+            {emojis[a] && <>{emojis[a]}&nbsp;</>}
+            {a === 1000 ? "1K" : formatShort(a)}
+          </span>
+        ))}
+      </div>
+    );
+  }
+
   function invoiceForm() {
     if (invoice) return null;
     return (
@@ -211,14 +235,7 @@ export default function LNURLTip(props: LNURLTipProps) {
         <h3>
           <FormattedMessage {...messages.ZapAmount} />
         </h3>
-        <div className="amounts" ref={horizontalScroll}>
-          {serviceAmounts.map(a => (
-            <span className={`sat-amount ${amount === a ? "active" : ""}`} key={a} onClick={() => selectAmount(a)}>
-              {emojis[a] && <>{emojis[a]}&nbsp;</>}
-              {formatShort(a)}
-            </span>
-          ))}
-        </div>
+        {amountRows.map(amounts => renderAmounts(amount, amounts))}
         {payService && custom()}
         <div className="flex">
           {canComment && (
diff --git a/packages/app/src/Element/Tabs.tsx b/packages/app/src/Element/Tabs.tsx
index ab51c17e..c305d94f 100644
--- a/packages/app/src/Element/Tabs.tsx
+++ b/packages/app/src/Element/Tabs.tsx
@@ -31,7 +31,7 @@ function clamp(n: number, min: number, max: number) {
 
 export const TabElement = ({ t, tab, setTab }: TabElementProps) => {
   const style = useMemo(() => {
-    return { minWidth: `${clamp(t.text.length, 2, 7)}em` } as CSSProperties;
+    return { minWidth: `${clamp(t.text.length, 3, 8) * 14}px` } as CSSProperties;
   }, [t.text]);
   return (
     <div
diff --git a/packages/app/src/Element/Timeline.css b/packages/app/src/Element/Timeline.css
index 28db963c..fb06141f 100644
--- a/packages/app/src/Element/Timeline.css
+++ b/packages/app/src/Element/Timeline.css
@@ -15,7 +15,13 @@
   box-shadow: 0px 0px 15px rgba(78, 0, 255, 0.6);
   border-radius: 100px;
   z-index: 42;
-  opacity: 0.8;
+  opacity: 0.9;
+}
+
+.latest-notes-fixed {
+  position: fixed;
+  left: calc(50% - 261px / 2 + 0.5px);
+  top: 12px;
 }
 
 @media (max-width: 520px) {
diff --git a/packages/app/src/Element/Timeline.tsx b/packages/app/src/Element/Timeline.tsx
index b9a05dfe..67904722 100644
--- a/packages/app/src/Element/Timeline.tsx
+++ b/packages/app/src/Element/Timeline.tsx
@@ -1,6 +1,7 @@
 import "./Timeline.css";
 import { FormattedMessage } from "react-intl";
 import { useCallback, useMemo } from "react";
+import { useInView } from "react-intersection-observer";
 
 import ArrowUp from "Icons/ArrowUp";
 import { dedupeByPubkey } from "Util";
@@ -33,15 +34,16 @@ export default function Timeline({
   postsOnly = false,
   method,
   ignoreModeration = false,
-  window,
+  window: timeWindow,
   relay,
 }: TimelineProps) {
   const { muted, isMuted } = useModeration();
   const { main, related, latest, parent, loadMore, showLatest } = useTimelineFeed(subject, {
     method,
-    window: window,
+    window: timeWindow,
     relay,
   });
+  const { ref, inView } = useInView();
 
   const filterPosts = useCallback(
     (nts: TaggedRawEvent[]) => {
@@ -84,19 +86,40 @@ export default function Timeline({
     }
   }
 
+  function onShowLatest(scrollToTop = false) {
+    showLatest();
+    if (scrollToTop) {
+      window.scrollTo(0, 0);
+    }
+  }
+
   return (
     <div className="main-content">
       {latestFeed.length > 0 && (
-        <div className="card latest-notes pointer" onClick={() => showLatest()}>
-          {latestAuthors.slice(0, 3).map(p => {
-            return <ProfileImage pubkey={p} showUsername={false} linkToProfile={false} />;
-          })}
-          <FormattedMessage
-            defaultMessage="{n} new {n, plural, =1 {note} other {notes}}"
-            values={{ n: latestFeed.length }}
-          />
-          <ArrowUp />
-        </div>
+        <>
+          <div className="card latest-notes pointer" onClick={() => onShowLatest()} ref={ref}>
+            {latestAuthors.slice(0, 3).map(p => {
+              return <ProfileImage pubkey={p} showUsername={false} linkToProfile={false} />;
+            })}
+            <FormattedMessage
+              defaultMessage="{n} new {n, plural, =1 {note} other {notes}}"
+              values={{ n: latestFeed.length }}
+            />
+            <ArrowUp />
+          </div>
+          {!inView && (
+            <div className="card latest-notes latest-notes-fixed pointer" onClick={() => onShowLatest(true)}>
+              {latestAuthors.slice(0, 3).map(p => {
+                return <ProfileImage pubkey={p} showUsername={false} linkToProfile={false} />;
+              })}
+              <FormattedMessage
+                defaultMessage="{n} new {n, plural, =1 {note} other {notes}}"
+                values={{ n: latestFeed.length }}
+              />
+              <ArrowUp />
+            </div>
+          )}
+        </>
       )}
       {mainFeed.map(eventElement)}
       <LoadMore onLoadMore={loadMore} shouldLoadMore={main.end}>
diff --git a/packages/app/src/index.css b/packages/app/src/index.css
index 0f419d06..d22fce3a 100644
--- a/packages/app/src/index.css
+++ b/packages/app/src/index.css
@@ -39,6 +39,10 @@
   --strike-army-gradient: linear-gradient(to bottom right, #ccff00, #a1c900);
 }
 
+html {
+  scroll-behavior: smooth;
+}
+
 html.light {
   --bg-color: #f8f8f8;
   --font-color: #27272a;