From 192d911f24c19a13cd89562d9013f4228d80d6cd Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Thu, 16 Mar 2023 05:33:03 -0700
Subject: [PATCH 1/5] Add Dread Barrage section to raid list

---
 data/raidGroups.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/data/raidGroups.tsx b/data/raidGroups.tsx
index 58d20d0b..55f57fd6 100644
--- a/data/raidGroups.tsx
+++ b/data/raidGroups.tsx
@@ -109,6 +109,12 @@ export const raidGroups: RaidGroup[] = [
       ja: 'アーカルム　レプリカルド・サンドボックス',
     },
   },
+  {
+    name: {
+      en: 'Dread Barrage',
+      ja: 'ドレッドバラージュ',
+    },
+  },
   {
     name: {
       en: 'Astrals',

From 08eaa1198dc2d82c233b795e5d98ec0910d6871d Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Thu, 16 Mar 2023 05:33:11 -0700
Subject: [PATCH 2/5] Sort GW and DB raids correctly

---
 components/RaidDropdown/index.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/RaidDropdown/index.tsx b/components/RaidDropdown/index.tsx
index a1ef9ad6..27becd91 100644
--- a/components/RaidDropdown/index.tsx
+++ b/components/RaidDropdown/index.tsx
@@ -99,7 +99,12 @@ const RaidDropdown = React.forwardRef<HTMLSelectElement, Props>(
         sortedRaids.length > 0 &&
         sortedRaids[index].length > 0 &&
         sortedRaids[index]
-          .sort((a, b) => a.element - b.element)
+          .sort((a, b) => {
+            if (a.element > 0 && b.element > 0) return a.element - b.element
+            else if (a.name.en.includes('NM') && b.name.en.includes('NM'))
+              return a.level < b.level ? -1 : 1
+            else return a.name.en < b.name.en ? -1 : 1
+          })
           .map((item, i) => (
             <SelectItem key={i} value={item.slug}>
               {item.name[locale]}

From 9e5e8b4baf71eb7cc1be32f5d871880060b6d554 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Thu, 16 Mar 2023 05:54:06 -0700
Subject: [PATCH 3/5] Rename Guild Wars section

---
 data/raidGroups.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/raidGroups.tsx b/data/raidGroups.tsx
index 55f57fd6..b7bdc8a2 100644
--- a/data/raidGroups.tsx
+++ b/data/raidGroups.tsx
@@ -15,7 +15,7 @@ export const raidGroups: RaidGroup[] = [
   },
   {
     name: {
-      en: 'Guild Wars',
+      en: 'Unite and Fight',
       ja: '星の古戦場',
     },
   },

From 5bc267f3e2b77caca1920535ed94261aab6c1430 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Thu, 16 Mar 2023 05:54:20 -0700
Subject: [PATCH 4/5] Fix ContentUpdate styling

---
 components/ContentUpdate/index.scss | 11 +++++++++++
 components/ContentUpdate/index.tsx  |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/components/ContentUpdate/index.scss b/components/ContentUpdate/index.scss
index e69de29b..6d8cc907 100644
--- a/components/ContentUpdate/index.scss
+++ b/components/ContentUpdate/index.scss
@@ -0,0 +1,11 @@
+.Content.Version {
+  .Contents {
+    margin-bottom: $unit-3x;
+  }
+
+  .Notes h4 {
+    font-weight: $medium;
+    font-size: $font-regular;
+    margin-bottom: $unit-2x;
+  }
+}
diff --git a/components/ContentUpdate/index.tsx b/components/ContentUpdate/index.tsx
index 33aa6a32..13df3c85 100644
--- a/components/ContentUpdate/index.tsx
+++ b/components/ContentUpdate/index.tsx
@@ -117,9 +117,9 @@ const ContentUpdate = ({
         {uncapItemSection('summon')}
       </div>
       {numNotes > 0 ? (
-        <div>
+        <div className="Notes">
           <section>
-            <h2>{updates('labels.updates')}</h2>
+            <h4>{updates('labels.updates')}</h4>
             <ul className="Bare Contents">
               {[...Array(numNotes)].map((e, i) => (
                 <li key={`${version}-${i}`}>

From 157dd094768842faedfb1361967ecb13bd426fa7 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Thu, 16 Mar 2023 05:54:27 -0700
Subject: [PATCH 5/5] Add 2023-03 Flash update

---
 components/UpdatesPage/index.tsx | 10 ++++++++++
 public/locales/en/updates.json   |  9 +++++++++
 public/locales/ja/updates.json   |  9 +++++++++
 3 files changed, 28 insertions(+)

diff --git a/components/UpdatesPage/index.tsx b/components/UpdatesPage/index.tsx
index 2b710efc..e79f3139 100644
--- a/components/UpdatesPage/index.tsx
+++ b/components/UpdatesPage/index.tsx
@@ -56,6 +56,16 @@ const UpdatesPage = () => {
   return (
     <div className="Updates PageContent">
       <h1>{common('about.segmented_control.updates')}</h1>
+      <ContentUpdate
+        version="2023-03F"
+        dateString="2023/03/16"
+        event="events.flash"
+        newItems={{
+          character: ['3040451000', '3040452000', '3040453000', '3040454000'],
+          weapon: ['1040914600', '1040116800', '1040515900', '1040712300'],
+        }}
+        numNotes={5}
+      />
       <ContentUpdate
         version="2023-02L"
         dateString="2023/02/27"
diff --git a/public/locales/en/updates.json b/public/locales/en/updates.json
index a89ca2d4..2a1f1671 100644
--- a/public/locales/en/updates.json
+++ b/public/locales/en/updates.json
@@ -18,6 +18,15 @@
     "uncap": "Uncap"
   },
   "versions": {
+    "2023-03F": {
+      "features": [
+        "Added new class \"Yamato\"",
+        "Added Ultimate Mastery skills for classes: Berserker, Apsaras, Nekomancer, Kengo",
+        "Added raids for Dread Barrage",
+        "Renamed \"Guild Wars\" in raid list to \"Unite and Fight\"",
+        "Fixed sorting of raids for Dread Barrage and Unite and Fight"
+      ]
+    },
     "2023-02-U2": {
       "features": ["Added official names for Proven Weapons and Revans Weapons"]
     },
diff --git a/public/locales/ja/updates.json b/public/locales/ja/updates.json
index 37ee75be..0a32347f 100644
--- a/public/locales/ja/updates.json
+++ b/public/locales/ja/updates.json
@@ -18,6 +18,15 @@
     "uncap": "上限解放"
   },
   "versions": {
+    "2023-03F": {
+      "features": [
+        "新ジョブ「ヤマト」を追加",
+        "「ベルセルク」「アプサラス」「黒猫道士」「剣豪」の極致の証スキルを追加",
+        "ドレッドバラージュのマルチバトルをリストに追加",
+        "英語のリストに\"Guild Wars\"のラベルを\"Unite and Fight\"に変更",
+        "「ドレッドバラージュ」と「星の古戦場」のマルチバトルを並び替えました"
+      ]
+    },
     "2023-02-U2": {
       "features": ["ブレイブウェポンとレヴァンスウェポンの公式名を追加"]
     },