diff --git a/packages/app/config/default.json b/packages/app/config/default.json
index 3cdd84b6..90d2fcb4 100644
--- a/packages/app/config/default.json
+++ b/packages/app/config/default.json
@@ -18,15 +18,15 @@
"notificationGraph": true,
"communityLeaders": true,
"nostrAddress": true,
- "pushNotifications": true,
- "forYouFeed": false
+ "pushNotifications": true
},
"signUp": {
"quickStart": false,
"defaultFollows": ["npub1sn0rtcjcf543gj4wsg7fa59s700d5ztys5ctj0g69g2x6802npjqhjjtws"]
},
"defaultPreferences": {
- "hideMutedNotes": false
+ "hideMutedNotes": false,
+ "defaultRootTab": "following"
},
"media": {
"bypassImgProxyError": false,
diff --git a/packages/app/config/iris.json b/packages/app/config/iris.json
index d5437bb2..fd3c60a8 100644
--- a/packages/app/config/iris.json
+++ b/packages/app/config/iris.json
@@ -16,11 +16,11 @@
"deck": true,
"zapPool": true,
"notificationGraph": false,
- "communityLeaders": true,
- "forYouFeed": true
+ "communityLeaders": true
},
"defaultPreferences": {
- "hideMutedNotes": true
+ "hideMutedNotes": true,
+ "defaultRootTab": "for-you"
},
"signUp": {
"quickStart": true,
diff --git a/packages/app/config/nostr.json b/packages/app/config/nostr.json
index a2e23f24..3b650146 100644
--- a/packages/app/config/nostr.json
+++ b/packages/app/config/nostr.json
@@ -25,7 +25,8 @@
"defaultFollows": []
},
"defaultPreferences": {
- "hideMutedNotes": false
+ "hideMutedNotes": false,
+ "defaultRootTab": "following"
},
"media": {
"bypassImgProxyError": false,
diff --git a/packages/app/custom.d.ts b/packages/app/custom.d.ts
index f5122ec2..de2f2c46 100644
--- a/packages/app/custom.d.ts
+++ b/packages/app/custom.d.ts
@@ -61,10 +61,10 @@ declare const CONFIG: {
communityLeaders: boolean;
nostrAddress: boolean;
pushNotifications: boolean;
- forYouFeed: boolean;
};
defaultPreferences: {
hideMutedNotes: boolean;
+ defaultRootTab: "following" | "for-you";
};
signUp: {
quickStart: boolean;
diff --git a/packages/app/src/Components/Feed/RootTabItems.tsx b/packages/app/src/Components/Feed/RootTabItems.tsx
index 0b9ed0f4..b1ea0930 100644
--- a/packages/app/src/Components/Feed/RootTabItems.tsx
+++ b/packages/app/src/Components/Feed/RootTabItems.tsx
@@ -10,7 +10,7 @@ export function rootTabItems(base: string, pubKey: string | undefined, tags: New
{
tab: "for-you",
path: `${base}/for-you`,
- show: Boolean(pubKey) && CONFIG.features.forYouFeed,
+ show: Boolean(pubKey),
element: (
<>
diff --git a/packages/app/src/Components/Feed/RootTabs.tsx b/packages/app/src/Components/Feed/RootTabs.tsx
index e0a4aab6..60be72ca 100644
--- a/packages/app/src/Components/Feed/RootTabs.tsx
+++ b/packages/app/src/Components/Feed/RootTabs.tsx
@@ -26,7 +26,7 @@ export function RootTabs({ base = "/" }: { base: string }) {
let defaultTab: RootTabRoutePath;
if (pubKey) {
- defaultTab = preferences.defaultRootTab ?? (CONFIG.features.forYouFeed ? "for-you" : "following");
+ defaultTab = preferences.defaultRootTab;
} else {
defaultTab = `trending/notes`;
}
diff --git a/packages/app/src/Pages/Root/DefaultTab.tsx b/packages/app/src/Pages/Root/DefaultTab.tsx
index fccf93c4..db7aef30 100644
--- a/packages/app/src/Pages/Root/DefaultTab.tsx
+++ b/packages/app/src/Pages/Root/DefaultTab.tsx
@@ -8,5 +8,5 @@ export const DefaultTab = () => {
}));
const tab = publicKey ? preferences.defaultRootTab : `trending/notes`;
const elm = RootTabRoutes.find(a => a.path === tab)?.element;
- return elm ?? RootTabRoutes.find(a => a.path === (CONFIG.features.forYouFeed ? "for-you" : "following"))?.element;
+ return elm ?? RootTabRoutes.find(a => a.path === preferences.defaultRootTab)?.element;
};
diff --git a/packages/app/src/Pages/onboarding/start.tsx b/packages/app/src/Pages/onboarding/start.tsx
index 6184ab88..03a2522f 100644
--- a/packages/app/src/Pages/onboarding/start.tsx
+++ b/packages/app/src/Pages/onboarding/start.tsx
@@ -1,5 +1,6 @@
import { unwrap } from "@snort/shared";
import { NotEncrypted } from "@snort/system";
+import { SnortContext } from "@snort/system-react";
import classNames from "classnames";
import { FormEvent, useContext, useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
@@ -12,7 +13,6 @@ import { trackEvent } from "@/Utils";
import { generateNewLogin, LoginSessionType, LoginStore } from "@/Utils/Login";
import { NewUserState } from ".";
-import { SnortContext } from "@snort/system-react";
const NSEC_NPUB_REGEX = /(nsec1|npub1)[a-zA-Z0-9]{20,65}/gi;
diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx
index 9d84ab71..d8c5530a 100644
--- a/packages/app/src/Pages/settings/Preferences.tsx
+++ b/packages/app/src/Pages/settings/Preferences.tsx
@@ -84,11 +84,9 @@ const PreferencesPage = () => {
defaultRootTab: e.target.value,
} as UserPreferences)
}>
- {CONFIG.features.forYouFeed && (
-
- )}
+
diff --git a/packages/app/src/Utils/Login/Preferences.ts b/packages/app/src/Utils/Login/Preferences.ts
index 2927a52c..e05e0cce 100644
--- a/packages/app/src/Utils/Login/Preferences.ts
+++ b/packages/app/src/Utils/Login/Preferences.ts
@@ -114,7 +114,7 @@ export const DefaultPreferences = {
autoShowLatest: false,
fileUploader: "void.cat",
imgProxyConfig: DefaultImgProxy,
- defaultRootTab: CONFIG.features.forYouFeed ? "for-you" : "following",
+ defaultRootTab: "following",
defaultZapAmount: 50,
autoZap: false,
telemetry: true,