From 4fab4dc2759e2bbd164d712d947bde98845d17bc Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Thu, 21 Jul 2022 22:00:15 +0800
Subject: [PATCH] ui: fix problem_submit language selection

---
 packages/ui-default/package.json                  | 2 +-
 packages/ui-default/pages/problem_submit.page.tsx | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index fd900f2ed..58c963179 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.38.17",
+  "version": "4.38.18",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/pages/problem_submit.page.tsx b/packages/ui-default/pages/problem_submit.page.tsx
index 9d9a7683f..09f43e4a0 100644
--- a/packages/ui-default/pages/problem_submit.page.tsx
+++ b/packages/ui-default/pages/problem_submit.page.tsx
@@ -33,7 +33,11 @@ const page = new NamedPage(['problem_submit', 'contest_detail_problem_submit', '
         return [preference, ''];
       }
     }
-    return [Object.keys(mainLangs)[0], ''];
+    const selected = Object.keys(mainLangs)[0];
+    for (const key in availableLangs) {
+      if (key.startsWith(`${selected}.`)) return [selected, key.split('.')[1]];
+    }
+    return [selected, ''];
   })();
 
   function LanguageSelect() {
@@ -56,7 +60,7 @@ const page = new NamedPage(['problem_submit', 'contest_detail_problem_submit', '
 
     return (
       <>
-        {Object.keys(mainLangs).length > 1 && (
+        {(Object.keys(mainLangs).length > 1 || Object.keys(options).length === 1) && (
           <div className="medium-5 columns form__item end">
             <label>
               {i18n('Code language')}