From d0cb44a5664a5300bb9b6d196e8dfa80c995a24a Mon Sep 17 00:00:00 2001
From: Vivek Ganesan <vivek@vivekganesan.com>
Date: Mon, 17 Apr 2023 19:03:31 +0530
Subject: [PATCH] fix #517 (#518)

* fix #517

* delete commented test for build pass

* fix unrelated formatting errors
---
 packages/app/src/Element/NoteCreator.tsx       | 15 ++-------------
 packages/app/src/Login/Preferences.ts          |  1 +
 .../app/src/Pages/settings/Preferences.tsx     |  4 ++--
 packages/app/src/State/NoteCreator.ts          |  2 +-
 packages/app/src/System/EventBuilder.test.ts   | 18 ------------------
 5 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 packages/app/src/System/EventBuilder.test.ts

diff --git a/packages/app/src/Element/NoteCreator.tsx b/packages/app/src/Element/NoteCreator.tsx
index 0c4b1753..a89c4f47 100644
--- a/packages/app/src/Element/NoteCreator.tsx
+++ b/packages/app/src/Element/NoteCreator.tsx
@@ -52,19 +52,8 @@ export function NoteCreator() {
   const { formatMessage } = useIntl();
   const publisher = useEventPublisher();
   const uploader = useFileUpload();
-  const {
-    note,
-    zapForward,
-    sensitive,
-    pollOptions,
-    replyTo,
-    otherEvents,
-    preview,
-    active,
-    show,
-    showAdvanced,
-    error,
-  } = useSelector((s: RootState) => s.noteCreator);
+  const { note, zapForward, sensitive, pollOptions, replyTo, otherEvents, preview, active, show, showAdvanced, error } =
+    useSelector((s: RootState) => s.noteCreator);
   const [uploadInProgress, setUploadInProgress] = useState(false);
   const dispatch = useDispatch();
 
diff --git a/packages/app/src/Login/Preferences.ts b/packages/app/src/Login/Preferences.ts
index 005714d1..774817e9 100644
--- a/packages/app/src/Login/Preferences.ts
+++ b/packages/app/src/Login/Preferences.ts
@@ -74,6 +74,7 @@ export interface UserPreferences {
 }
 
 export const DefaultPreferences = {
+  language: "en",
   enableReactions: true,
   reactionEmoji: "+",
   autoLoadMedia: "follows-only",
diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx
index e477d7d4..289c968a 100644
--- a/packages/app/src/Pages/settings/Preferences.tsx
+++ b/packages/app/src/Pages/settings/Preferences.tsx
@@ -5,7 +5,7 @@ import { Link } from "react-router-dom";
 import emoji from "@jukben/emoji-search";
 
 import useLogin from "Hooks/useLogin";
-import { updatePreferences, UserPreferences } from "Login";
+import { DefaultPreferences, updatePreferences, UserPreferences } from "Login";
 import { DefaultImgProxy } from "Const";
 import { unwrap } from "Util";
 
@@ -30,7 +30,7 @@ const PreferencesPage = () => {
         </div>
         <div>
           <select
-            value={perf.language}
+            value={perf.language || DefaultPreferences.language}
             onChange={e =>
               updatePreferences(login, {
                 ...perf,
diff --git a/packages/app/src/State/NoteCreator.ts b/packages/app/src/State/NoteCreator.ts
index 484a1cc5..123966ff 100644
--- a/packages/app/src/State/NoteCreator.ts
+++ b/packages/app/src/State/NoteCreator.ts
@@ -23,7 +23,7 @@ const InitState: NoteCreatorStore = {
   showAdvanced: false,
   zapForward: "",
   sensitive: "",
-  otherEvents: []
+  otherEvents: [],
 };
 
 const NoteCreatorSlice = createSlice({
diff --git a/packages/app/src/System/EventBuilder.test.ts b/packages/app/src/System/EventBuilder.test.ts
deleted file mode 100644
index 30878519..00000000
--- a/packages/app/src/System/EventBuilder.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*import { EventKind } from "@snort/nostr";
-import { EventBuilder } from "./EventBuilder";
-
-const PubKey = "test-key";
-
-describe("EventBuilder", () => {
-  it("should not add duplicate tags", () => {
-    const eb = new EventBuilder();
-    eb.pubKey(PubKey);
-    eb.kind(EventKind.TextNote);
-
-    eb.tag(["p", PubKey]);
-    eb.tag(["p", PubKey]);
-    const out = eb.build();
-    expect(out.tags.length).toBe(1);
-  });
-});
-*/