Merge remote-tracking branch 'origin/main' into gossip-model

2023-06-13 10:05:53 +01:00
parent 7da4f350a6 6c2cbd202c
commit 9515dcbbbb
40 changed files with 604 additions and 151 deletions
--- a/packages/app/src/Pages/settings/Preferences.tsx
+++ b/packages/app/src/Pages/settings/Preferences.tsx
@ -115,8 +115,8 @@ const PreferencesPage = () => {
                defaultRootTab: e.target.value,
              } as UserPreferences)
            }>
-            <option value="posts">
-              <FormattedMessage {...messages.Posts} />
+            <option value="notes">
+              <FormattedMessage defaultMessage="Notes" />
            </option>
            <option value="conversations">
              <FormattedMessage {...messages.Conversations} />