Merge branch 'staging' into advanced-filters

components/ExtraWeapons/index.tsx

@@ -29,7 +29,7 @@ const ExtraWeapons = (props: Props) => {
           return (
             <li key={`grid_unit_${i}`}>
               <WeaponUnit
-                editable={i < 2 ? props.editable : false}
+                editable={props.editable}
                 position={props.offset + i}
                 unitType={1}
                 gridWeapon={props.grid[props.offset + i]}

components/UpdatesPage/index.tsx

@@ -56,6 +56,46 @@ const UpdatesPage = () => {
   return (
     <div className="Updates PageContent">
       <h1>{common('about.segmented_control.updates')}</h1>
+      <ContentUpdate
+        version="2023-04U"
+        dateString="2023/04/01"
+        event="events.content"
+        newItems={{
+          character: ['3040457000'],
+          summon: ['2040419000'],
+        }}
+        numNotes={0}
+      />
+      <ContentUpdate
+        version="2023-03L"
+        dateString="2023/03/31"
+        event="events.legfest"
+        newItems={{
+          character: ['3040456000', '3040455000'],
+          weapon: ['1040316100', '1040617500'],
+        }}
+        numNotes={0}
+      />
+      <ContentUpdate
+        version="2023-03U2"
+        dateString="2023/03/30"
+        event="events.content"
+        uncappedItems={{
+          character: ['3040164000', '3040160000'],
+        }}
+        newItems={{
+          weapon: [
+            '1040815100',
+            '1040815200',
+            '1040815300',
+            '1040815400',
+            '1040815000',
+            '1040024400',
+            '1030609400',
+          ],
+        }}
+        numNotes={1}
+      />
       <ContentUpdate
         version="2023-03U"
         dateString="2023/03/22"

data/weaponSeries.tsx

@@ -120,4 +120,8 @@ export const weaponSeries: WeaponSeries[] = [
     id: 31,
     slug: 'illustrious',
   },
+  {
+    id: 32,
+    slug: 'world',
+  },
 ]

public/locales/en/common.json

@@ -145,7 +145,8 @@
     "revenant": "Revenant",
     "proving": "Proven",
     "disaster": "Revans",
-    "illustrious": "Illustrious"
+    "illustrious": "Illustrious",
+    "world": "World"
   },
   "recency": {
     "all_time": "All time",

public/locales/en/updates.json

@@ -19,6 +19,9 @@
     "uncap": "Uncap"
   },
   "versions": {
+    "2023-03U2": {
+      "features": ["Added new weapon series, World Series"]
+    },
     "2023-03U": {
       "features": [
         "Added Siete HL (raid)",

public/locales/ja/common.json

@@ -145,7 +145,8 @@
     "revenant": "天星器",
     "proving": "ブレイブウェポン",
     "disaster": "レヴァンスウェポン",
-    "luminous": "ルミナス"
+    "illustrious": "ルミナスシリーズ",
+    "world": "ワールドシリーズ"
   },
   "recency": {
     "all_time": "全ての期間",

public/locales/ja/updates.json

@@ -19,6 +19,9 @@
     "uncap": "上限解放"
   },
   "versions": {
+    "2023-03U2": {
+      "features": ["武器シリーズ「ワールドシリーズ」を追加"]
+    },
     "2023-03F": {
       "features": [
         "新ジョブ「ヤマト」を追加",

utils/emptyStates.tsx

@@ -204,6 +204,10 @@ export const emptyWeaponSeriesState: WeaponSeriesState = {
     id: 31,
     checked: false,
   },
+  world: {
+    id: 32,
+    checked: false,
+  },
 }
 
 export const emptyPaginationObject = {