Merge branch 'preview'

pdelfan · Mar 14, 2024 · b3e25f0 · b3e25f0
2 parents 0e3d0e0 + 1cc84b2
commit b3e25f0
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/src/app/(site)/about/page.tsx b/src/app/(site)/about/page.tsx
@@ -119,7 +119,7 @@ export default function Page() {
           Where can I see progress updates?
         </h3>
         <p className="text-skin-base">
-          For the moment, you can see what is being worked on under{" "}
+          You can see what is being worked on under{" "}
           <Link
             href="https://github.com/users/pdelfan/projects/1"
             className="underline underline-offset-2"

diff --git a/src/components/contentDisplay/lists/Lists.tsx b/src/components/contentDisplay/lists/Lists.tsx
@@ -48,7 +48,7 @@ export default function Lists() {
         next={fetchNextPage}
         hasMore={hasNextPage}
         loader={<LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar flex flex-col"
       >
         {lists?.pages

diff --git a/src/components/feedback/alert/Alert.tsx b/src/components/feedback/alert/Alert.tsx
@@ -10,7 +10,7 @@ export default function Alert(props: Props) {
   const icon = getAlertIcon(variant);
 
   return (
-    <div className="bg-skin-tertiary flex flex-wrap items-center gap-2 rounded-lg p-3 font-medium text-sky-50">
+    <div className="bg-skin-tertiary text-skin-base flex flex-wrap items-center gap-2 rounded-lg p-3 font-medium">
       {icon} {message}
     </div>
   );

diff --git a/src/containers/lists/ListMembersContainer.tsx b/src/containers/lists/ListMembersContainer.tsx
@@ -48,7 +48,7 @@ export default function ListMembersContainer(props: Props) {
         next={fetchNextPage}
         hasMore={hasNextPage}
         loader={<LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar flex flex-col"
       >
         {profiles &&

diff --git a/src/containers/lists/ListsContainer.tsx b/src/containers/lists/ListsContainer.tsx
@@ -52,7 +52,7 @@ export default function ListsContainer(props: Props) {
         next={fetchNextPage}
         hasMore={hasNextPage}
         loader={<LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar flex flex-col"
       >
         {lists?.pages

diff --git a/src/containers/notifications/FilteredNotificationsContainer.tsx b/src/containers/notifications/FilteredNotificationsContainer.tsx
@@ -74,7 +74,7 @@ export default function FilteredNotificationsContainer(props: Props) {
         next={fetchNotificationNextPage}
         hasMore={notificationHasNextPage}
         loader={!isFetchingMore && <LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar flex flex-col"
       >
         {notificationData &&

diff --git a/src/containers/posts/FeedContainer.tsx b/src/containers/posts/FeedContainer.tsx
@@ -61,7 +61,7 @@ export default function FeedContainer(props: Props) {
         next={fetchNextFeedPage}
         hasMore={feedHasNextPage}
         loader={<LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar"
       >
         {isFetchingFeed && !isFetchingFeedNextPage && <FeedPostSkeleton />}

diff --git a/src/containers/posts/UserPostsContainer.tsx b/src/containers/posts/UserPostsContainer.tsx
@@ -63,7 +63,7 @@ export default function UserPostsConatiner(props: Props) {
         next={fetchNextUserPostsPage}
         hasMore={userPostsHasNextPage}
         loader={<LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar"
       >
         {!isBlocked &&

diff --git a/src/containers/search/PostSearchContainer.tsx b/src/containers/search/PostSearchContainer.tsx
@@ -48,7 +48,7 @@ export default function PostSearchContainer(props: Props) {
         next={fetchNextPage}
         hasMore={hasNextPage}
         loader={<LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar flex flex-col"
       >
         {posts?.pages

diff --git a/src/containers/settings/blockedUsersContainer/BlockedUsersContainer.tsx b/src/containers/settings/blockedUsersContainer/BlockedUsersContainer.tsx
@@ -51,7 +51,7 @@ export default function BlockedUsersContainer() {
             next={fetchNextPage}
             hasMore={hasNextPage}
             loader={<LoadingSpinner />}
-            scrollThreshold={0.95}
+            scrollThreshold={0.8}
             className="no-scrollbar flex flex-col"
           >
             {profiles &&

diff --git a/src/containers/settings/mutedUsersContainer/MutedUsersContainer.tsx b/src/containers/settings/mutedUsersContainer/MutedUsersContainer.tsx
@@ -48,7 +48,7 @@ export default function MutedUsersContainer() {
           next={fetchNextPage}
           hasMore={hasNextPage}
           loader={<LoadingSpinner />}
-          scrollThreshold={0.95}
+          scrollThreshold={0.8}
           className="no-scrollbar flex flex-col"
         >
           {profiles &&

diff --git a/src/containers/thread/LikedByContainer.tsx b/src/containers/thread/LikedByContainer.tsx
@@ -53,7 +53,7 @@ export default function LikedByContainer(props: Props) {
         next={fetchNextPage}
         hasMore={hasNextPage}
         loader={<LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar flex flex-col"
       >
         {profiles &&

diff --git a/src/containers/thread/RepostedByContainer.tsx b/src/containers/thread/RepostedByContainer.tsx
@@ -53,7 +53,7 @@ export default function RepostedByContainer(props: Props) {
         next={fetchNextPage}
         hasMore={hasNextPage}
         loader={<LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar flex flex-col"
       >
         {profiles &&

diff --git a/src/containers/users/FollowersContainer.tsx b/src/containers/users/FollowersContainer.tsx
@@ -47,7 +47,7 @@ export default function FollowersContainer(props: Props) {
         next={fetchNextPage}
         hasMore={hasNextPage}
         loader={<LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar flex flex-col"
       >
         {profiles &&

diff --git a/src/containers/users/FollowingContainer.tsx b/src/containers/users/FollowingContainer.tsx
@@ -48,7 +48,7 @@ export default function FollowingContainer(props: Props) {
         next={fetchNextPage}
         hasMore={hasNextPage}
         loader={<LoadingSpinner />}
-        scrollThreshold={0.95}
+        scrollThreshold={0.8}
         className="no-scrollbar flex flex-col"
       >
         {profiles &&

diff --git a/src/lib/hooks/bsky/feed/usePublishPost.tsx b/src/lib/hooks/bsky/feed/usePublishPost.tsx
@@ -256,7 +256,7 @@ export default function usePublishPost(props: Props) {
       toast.success("Post published", { id: "Post publish" });
     },
     onError: (e) => {
-      toast.error(e.message);
+      toast.error(e.message, { id: "Post error" });
     },
   });
 }
diff --git a/src/styles/globals.css b/src/styles/globals.css
@@ -55,7 +55,7 @@
         /* Background */
         --color-background-base: 24, 5, 41; /* 180529 */
         --color-background-secondary: 38, 6, 64; /* 260640 */
-        --color-background-tertiary: 43, 25, 59; /* 2b193b */
+        --color-background-tertiary: 64, 41, 84; /* 402954 */
         --color-background-muted: 97, 86, 107; /* 61566b */
         --color-background-inverted: 245, 245, 245; /* bg-neutral-100 */
         --color-background-inverted-muted: 212, 212, 212; /* bg-neutral-300 */