From 40ed8059b7d725e272bc189440b293e28349afdb Mon Sep 17 00:00:00 2001
From: infinite-persistence <inf.persistence@gmail.com>
Date: Mon, 13 Sep 2021 15:42:46 +0800
Subject: [PATCH] Fix jumpy ui when changing language

Closes 7070 Spinner at wrong location when changing language
---
 ui/component/settingLanguage/view.jsx | 28 ++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ui/component/settingLanguage/view.jsx b/ui/component/settingLanguage/view.jsx
index 515970d6e..74c2d5491 100644
--- a/ui/component/settingLanguage/view.jsx
+++ b/ui/component/settingLanguage/view.jsx
@@ -35,20 +35,22 @@ function SettingLanguage(props: Props) {
 
   return (
     <React.Fragment>
-      {previousLanguage && <Spinner type="small" />}
+      {!previousLanguage && (
+        <FormField
+          name="language_select"
+          type="select"
+          onChange={onLanguageChange}
+          value={language || getDefaultLanguage()}
+        >
+          {sortLanguageMap(SUPPORTED_LANGUAGES).map(([langKey, langName]) => (
+            <option key={langKey} value={langKey}>
+              {langName}
+            </option>
+          ))}
+        </FormField>
+      )}
 
-      <FormField
-        name="language_select"
-        type="select"
-        onChange={onLanguageChange}
-        value={language || getDefaultLanguage()}
-      >
-        {sortLanguageMap(SUPPORTED_LANGUAGES).map(([langKey, langName]) => (
-          <option key={langKey} value={langKey}>
-            {langName}
-          </option>
-        ))}
-      </FormField>
+      {previousLanguage && <Spinner type="small" />}
     </React.Fragment>
   );
 }