There are many more settings you can configure from the 'Settings'
diff --git a/apps/desktop2/src/routes/create-group.tsx b/apps/desktop2/src/routes/create-group.tsx
index c3fe8048..811789fa 100644
--- a/apps/desktop2/src/routes/create-group.tsx
+++ b/apps/desktop2/src/routes/create-group.tsx
@@ -1,7 +1,7 @@
import { CheckCircleIcon } from "@lume/icons";
import { ColumnRouteSearch } from "@lume/types";
import { Column, User } from "@lume/ui";
-import { createFileRoute } from "@tanstack/react-router";
+import { createFileRoute, useRouter } from "@tanstack/react-router";
import { useState } from "react";
import { toast } from "sonner";
@@ -23,9 +23,10 @@ export const Route = createFileRoute("/create-group")({
function Screen() {
const contacts = Route.useLoaderData();
+ const router = useRouter();
const { ark } = Route.useRouteContext();
- const { label, name } = Route.useSearch();
+ const { label, name, redirect } = Route.useSearch();
const [title, setTitle] = useState("Just a new group");
const [users, setUsers] = useState>([]);
@@ -40,7 +41,7 @@ function Screen() {
const submit = async () => {
try {
- if (isDone) return history.back();
+ if (isDone) return router.history.push(redirect);
const groups = await ark.set_nstore(
`lume_group_${label}`,
diff --git a/apps/desktop2/src/routes/foryou.tsx b/apps/desktop2/src/routes/foryou.tsx
index 9e7cff13..6247dee7 100644
--- a/apps/desktop2/src/routes/foryou.tsx
+++ b/apps/desktop2/src/routes/foryou.tsx
@@ -24,8 +24,10 @@ export const Route = createFileRoute("/foryou")({
if (!interests) {
throw redirect({
to: "/interests",
- replace: false,
- search,
+ search: {
+ ...search,
+ redirect: "/foryou",
+ },
});
}
diff --git a/apps/desktop2/src/routes/group.tsx b/apps/desktop2/src/routes/group.tsx
index df59948e..11a7c3e2 100644
--- a/apps/desktop2/src/routes/group.tsx
+++ b/apps/desktop2/src/routes/group.tsx
@@ -24,8 +24,10 @@ export const Route = createFileRoute("/group")({
if (!groups) {
throw redirect({
to: "/create-group",
- replace: false,
- search,
+ search: {
+ ...search,
+ redirect: "/group",
+ },
});
}
diff --git a/apps/desktop2/src/routes/interests.tsx b/apps/desktop2/src/routes/interests.tsx
index 64988414..6fb6eefe 100644
--- a/apps/desktop2/src/routes/interests.tsx
+++ b/apps/desktop2/src/routes/interests.tsx
@@ -1,7 +1,7 @@
import { ColumnRouteSearch } from "@lume/types";
import { Column } from "@lume/ui";
import { TOPICS, cn } from "@lume/utils";
-import { createFileRoute } from "@tanstack/react-router";
+import { createFileRoute, useRouter } from "@tanstack/react-router";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
@@ -19,12 +19,14 @@ export const Route = createFileRoute("/interests")({
function Screen() {
const { t } = useTranslation();
- const { label, name } = Route.useSearch();
+ const { label, name, redirect } = Route.useSearch();
const { ark } = Route.useRouteContext();
const [hashtags, setHashtags] = useState([]);
const [isDone, setIsDone] = useState(false);
+ const router = useRouter();
+
const toggleHashtag = (item: string) => {
const arr = hashtags.includes(item)
? hashtags.filter((i) => i !== item)
@@ -40,7 +42,7 @@ function Screen() {
const submit = async () => {
try {
if (isDone) {
- return history.back();
+ return router.history.push(redirect);
}
const eventId = await ark.set_interest(undefined, undefined, hashtags);
diff --git a/apps/desktop2/src/routes/landing/index.tsx b/apps/desktop2/src/routes/landing/index.tsx
index 7fbcf6f2..f769ac26 100644
--- a/apps/desktop2/src/routes/landing/index.tsx
+++ b/apps/desktop2/src/routes/landing/index.tsx
@@ -38,23 +38,25 @@ function Screen() {
-
- Continue with Nostr Connect
+
+ Nostr Connect
+
-
- Continue with Private Key
+
+ Private Key
+
diff --git a/apps/desktop2/src/routes/newsfeed.tsx b/apps/desktop2/src/routes/newsfeed.tsx
index 15345211..ac4c92cd 100644
--- a/apps/desktop2/src/routes/newsfeed.tsx
+++ b/apps/desktop2/src/routes/newsfeed.tsx
@@ -1,16 +1,19 @@
-import { RepostNote } from "@/components/repost";
import { Suggest } from "@/components/suggest";
-import { TextNote } from "@/components/text";
-import { LoaderIcon, ArrowRightCircleIcon, InfoIcon } from "@lume/icons";
+import {
+ LoaderIcon,
+ ArrowRightCircleIcon,
+ InfoIcon,
+ RepostIcon,
+} from "@lume/icons";
import { ColumnRouteSearch, Event, Kind } from "@lume/types";
-import { Column } from "@lume/ui";
-import { useInfiniteQuery } from "@tanstack/react-query";
+import { Column, Note, User } from "@lume/ui";
+import { cn } from "@lume/utils";
+import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
import { createFileRoute } from "@tanstack/react-router";
import { useTranslation } from "react-i18next";
import { Virtualizer } from "virtua";
export const Route = createFileRoute("/newsfeed")({
- component: Screen,
validateSearch: (search: Record