Merge commit '911d6942f6a6c33f8e29247ed362cfa0e78acad2' into develop

components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx

@@ -58,8 +58,9 @@ export const HeaderText: FC<Props> = ({
     infogram,
     isEdit,
     uwasa,
+    vehicleFormation,
   ] = useMemo(() => {
-    const { type, trainName, trainNumDistance, infogram, isEdit, uwasa } =
+    const { type, trainName, trainNumDistance, infogram, isEdit, uwasa, vehicleFormation } =
       customTrainDataDetector(trainNum, allCustomTrainData);
     const [typeString, fontAvailable, isOneMan] = getStringConfig(
       type,
@@ -80,6 +81,7 @@ export const HeaderText: FC<Props> = ({
           infogram,
           isEdit,
           uwasa,
+          vehicleFormation
         ];
       case trainData[trainData.length - 1] === undefined:
         return [
@@ -90,6 +92,7 @@ export const HeaderText: FC<Props> = ({
           infogram,
           isEdit,
           uwasa,
+          vehicleFormation
         ];
       default:
         // 行先がある場合は、行先を取得
@@ -103,6 +106,7 @@ export const HeaderText: FC<Props> = ({
           infogram,
           isEdit,
           uwasa,
+          vehicleFormation
         ];
     }
   }, [trainData]);
@@ -146,7 +150,7 @@ export const HeaderText: FC<Props> = ({
             style={{ marginLeft: 5 }}
             onPress={() =>
               alert(
-                `[このアイコン、列車データはコミュニティによってリアルタイム追加されています。]\n↓投稿者メモ↓\n${uwasa}`
+                `[このアイコン、列車データはコミュニティによってリアルタイム追加されています。]\n使用車両情報:\n${vehicleFormation}\n投稿者メモ:\n${uwasa || "なし"}`
               )
             }
           />

components/Menu/FixedContentBottom.js

@@ -197,6 +197,19 @@ export const FixedContentBottom = (props) => {
         </Text>
       </TextBox>
       <Text style={{ fontWeight: "bold", fontSize: 20 }}>その他</Text>
+      <TextBox
+        backgroundColor="rgb(88, 101, 242)"
+        flex={1}
+        onPressButton={() => Linking.openURL("https://twitter.com/Xprocess_main/status/1955242437817012300")}
+      
+      >
+        <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
+          公式Discordのご案内
+        </Text>
+        <Text style={{ color: "white", fontSize: 18 }}>
+          皆さんの目撃情報をアプリに反映しませんか？Discordに登録して運用を報告しましょう！
+        </Text>
+      </TextBox>
       <TextBox
         backgroundColor="linear-gradient(120deg, rgba(247,135,54,0.208) 0%, rgba(54,125,247,0.208) 100%)"
         flex={1}

components/Settings/SettingTopPage.js

@@ -17,7 +17,7 @@ import { SwitchArea } from "../atom/SwitchArea";
 import { useNotification } from "../../stateBox/useNotifications";
 import { SheetHeaderItem } from "@/components/atom/SheetHeaderItem";
 
-const versionCode = "6.1.3"; // Update this version code as needed
+const versionCode = "6.1.4"; // Update this version code as needed
 
 export const SettingTopPage = ({
   testNFC,