From d52fdf64ca03ed338612be45d834aa80060f21f3 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sun, 19 May 2024 14:28:05 +0300
Subject: [PATCH] Invert stick / motion sens order to match in-game

---
 .../user-page/routes/u.$identifier.edit.tsx      | 16 ++++++++--------
 .../user-page/routes/u.$identifier.index.tsx     | 12 ++++++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/features/user-page/routes/u.$identifier.edit.tsx b/app/features/user-page/routes/u.$identifier.edit.tsx
index 32654912b..ab18c872b 100644
--- a/app/features/user-page/routes/u.$identifier.edit.tsx
+++ b/app/features/user-page/routes/u.$identifier.edit.tsx
@@ -338,11 +338,11 @@ function SensSelects({
   return (
     <div className="stack horizontal md">
       <div>
-        <Label htmlFor="stickSens">{t("user:stickSens")}</Label>
+        <Label htmlFor="motionSens">{t("user:motionSens")}</Label>
         <select
-          id="stickSens"
-          name="stickSens"
-          defaultValue={parentRouteData.stickSens ?? undefined}
+          id="motionSens"
+          name="motionSens"
+          defaultValue={parentRouteData.motionSens ?? undefined}
           className="u-edit__sens-select"
         >
           <option value="">{"-"}</option>
@@ -355,11 +355,11 @@ function SensSelects({
       </div>
 
       <div>
-        <Label htmlFor="motionSens">{t("user:motionSens")}</Label>
+        <Label htmlFor="stickSens">{t("user:stickSens")}</Label>
         <select
-          id="motionSens"
-          name="motionSens"
-          defaultValue={parentRouteData.motionSens ?? undefined}
+          id="stickSens"
+          name="stickSens"
+          defaultValue={parentRouteData.stickSens ?? undefined}
           className="u-edit__sens-select"
         >
           <option value="">{"-"}</option>
diff --git a/app/features/user-page/routes/u.$identifier.index.tsx b/app/features/user-page/routes/u.$identifier.index.tsx
index 9305f4d18..57d7c0a47 100644
--- a/app/features/user-page/routes/u.$identifier.index.tsx
+++ b/app/features/user-page/routes/u.$identifier.index.tsx
@@ -160,8 +160,13 @@ function ExtraInfos() {
 
   const motionSensText =
     typeof data.motionSens === "number"
-      ? ` / ${t("user:motion")} ${rawSensToString(data.motionSens)}`
-      : "";
+      ? `${t("user:motion")} ${rawSensToString(data.motionSens)}`
+      : null;
+
+  const stickSensText =
+    typeof data.stickSens === "number"
+      ? `${t("user:stick")} ${rawSensToString(data.stickSens)}`
+      : null;
 
   if (
     !data.inGameName &&
@@ -191,8 +196,7 @@ function ExtraInfos() {
       {typeof data.stickSens === "number" && (
         <div className="u__extra-info">
           <span className="u__extra-info__heading">{t("user:sens")}</span>{" "}
-          {t("user:stick")} {rawSensToString(data.stickSens)}
-          {motionSensText}
+          {[motionSensText, stickSensText].filter(Boolean).join(" / ")}
         </div>
       )}
       {data.plusTier && (