From 9b3b3adef9114581e3b61d23ee637c948e0f946d Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Wed, 17 May 2023 09:22:21 +0100
Subject: [PATCH] feat: add language selector to new user flow

---
 packages/app/src/Pages/new/NewUserFlow.tsx    | 36 ++++++++++++++++---
 .../app/src/Pages/settings/Preferences.tsx    | 34 +++++++++++++-----
 2 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/packages/app/src/Pages/new/NewUserFlow.tsx b/packages/app/src/Pages/new/NewUserFlow.tsx
index b63fb724e..528f9da51 100644
--- a/packages/app/src/Pages/new/NewUserFlow.tsx
+++ b/packages/app/src/Pages/new/NewUserFlow.tsx
@@ -7,9 +7,11 @@ import Copy from "Element/Copy";
 import { hexToBech32 } from "Util";
 import { hexToMnemonic } from "nip6";
 import useLogin from "Hooks/useLogin";
+import { PROFILE } from ".";
+import { DefaultPreferences, updatePreferences } from "Login";
+import { AllLanguageCodes } from "Pages/settings/Preferences";
 
 import messages from "./messages";
-import { PROFILE } from ".";
 
 const WhatIsSnort = () => {
   return (
@@ -84,7 +86,7 @@ const Extensions = () => {
 };
 
 export default function NewUserFlow() {
-  const { publicKey, generatedEntropy } = useLogin();
+  const login = useLogin();
   const navigate = useNavigate();
 
   return (
@@ -96,17 +98,43 @@ export default function NewUserFlow() {
       <h1>
         <FormattedMessage {...messages.SaveKeys} />
       </h1>
+      <div className="card flex">
+        <div className="flex f-col f-grow">
+          <div>
+            <FormattedMessage defaultMessage="Language" />
+          </div>
+        </div>
+        <div>
+          <select
+            value={login.preferences.language || DefaultPreferences.language}
+            onChange={e =>
+              updatePreferences(login, {
+                ...login.preferences,
+                language: e.target.value,
+              })
+            }
+            style={{ textTransform: "capitalize" }}>
+            {AllLanguageCodes.sort().map(a => (
+              <option value={a}>
+                {new Intl.DisplayNames([a], {
+                  type: "language",
+                }).of(a)}
+              </option>
+            ))}
+          </select>
+        </div>
+      </div>
       <p>
         <FormattedMessage {...messages.SaveKeysHelp} />
       </p>
       <h2>
         <FormattedMessage {...messages.YourPubkey} />
       </h2>
-      <Copy text={hexToBech32("npub", publicKey ?? "")} />
+      <Copy text={hexToBech32("npub", login.publicKey ?? "")} />
       <h2>
         <FormattedMessage {...messages.YourMnemonic} />
       </h2>
-      <Copy text={hexToMnemonic(generatedEntropy ?? "")} />
+      <Copy text={hexToMnemonic(login.generatedEntropy ?? "")} />
       <div className="next-actions">
         <button type="button" onClick={() => navigate(PROFILE)}>
           <FormattedMessage {...messages.KeysSaved} />{" "}
diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx
index 862946397..9d98e2c66 100644
--- a/packages/app/src/Pages/settings/Preferences.tsx
+++ b/packages/app/src/Pages/settings/Preferences.tsx
@@ -11,6 +11,24 @@ import { unwrap } from "Util";
 
 import messages from "./messages";
 
+export const AllLanguageCodes = [
+  "en",
+  "ja",
+  "es",
+  "hu",
+  "zh-CN",
+  "zh-TW",
+  "fr",
+  "ar",
+  "it",
+  "id",
+  "de",
+  "ru",
+  "sv",
+  "hr",
+  "ta-IN",
+];
+
 const PreferencesPage = () => {
   const { formatMessage } = useIntl();
   const login = useLogin();
@@ -38,15 +56,13 @@ const PreferencesPage = () => {
               })
             }
             style={{ textTransform: "capitalize" }}>
-            {["en", "ja", "es", "hu", "zh-CN", "zh-TW", "fr", "ar", "it", "id", "de", "ru", "sv", "hr", "ta-IN"]
-              .sort()
-              .map(a => (
-                <option value={a}>
-                  {new Intl.DisplayNames([a], {
-                    type: "language",
-                  }).of(a)}
-                </option>
-              ))}
+            {AllLanguageCodes.sort().map(a => (
+              <option value={a}>
+                {new Intl.DisplayNames([a], {
+                  type: "language",
+                }).of(a)}
+              </option>
+            ))}
           </select>
         </div>
       </div>