Merge branch 'feature/button-position-move' into develop

components/ActionSheetComponents/EachTrainInfo/TrainDataView.tsx

@@ -78,11 +78,15 @@ export const TrainDataView = ({
 
   const [trainNumber, setTrainNumber] = useState(currentTrainData?.num);
   useEffect(() => {
-    const {
+    const { TrainNumberOverride } = customTrainDataDetector(
-      TrainNumberOverride,
+      currentTrainData?.num,
-    } = customTrainDataDetector(currentTrainData?.num, allCustomTrainData);
+      allCustomTrainData
-    if (!TrainNumberOverride) return;
+    );
+    if (TrainNumberOverride) {
       setTrainNumber(TrainNumberOverride);
+    }else{
+      setTrainNumber(currentTrainData?.num);
+    }
   }, [currentTrainData?.num, allCustomTrainData]);
   // 投稿システム関係
   // Dialog表示関係

components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx

@@ -134,12 +134,6 @@ export const HeaderText: FC<Props> = ({
       <TrainIconStatus {...{ data, navigate, from }} />
       <TouchableOpacity
         style={{ borderRadius: 5, flexDirection: "row", alignItems: "center" }}
-        onLongPress={() => {
-          if (!updatePermission) return;
-          const uri = `https://jr-shikoku-data-post-system.pages.dev?trainNum=${trainNum}&token=${expoPushToken}`;
-          navigate("generalWebView", { uri, useExitButton: false });
-          SheetManager.hide("EachTrainInfo");
-        }}
         onPress={() => {
           if (!trainInfoUrl) return;
           const uri = trainInfoUrl.includes("pdf")
@@ -148,7 +142,7 @@ export const HeaderText: FC<Props> = ({
           navigate("generalWebView", { uri, useExitButton: true });
           SheetManager.hide("EachTrainInfo");
         }}
-        disabled={!(!!updatePermission || !!trainInfoUrl)}
+        disabled={!trainInfoUrl}
       >
         <Text
           style={{
@@ -182,11 +176,21 @@ export const HeaderText: FC<Props> = ({
       )}
 
       <View style={{ flex: 1 }} />
+      <TouchableOpacity
+        onLongPress={() => {
+          if (!updatePermission) return;
+          const uri = `https://jr-shikoku-data-post-system.pages.dev?trainNum=${trainNum}&token=${expoPushToken}`;
+          navigate("generalWebView", { uri, useExitButton: false });
+          SheetManager.hide("EachTrainInfo");
+        }}
+        disabled={!updatePermission}
+      >
         <Text style={textConfig}>
           {showHeadStation.map((d) => `${headStation[d].id} + `)}
           {trainNum}
           {showTailStation.map((d) => ` + ${tailStation[d].id}`)}
         </Text>
+      </TouchableOpacity>
 
       <TrainViewIcon {...{ data, navigate, from }} />
     </View>