Maerge Commits from release to staging #139

Merged
PxlLoewe merged 25 commits from release into staging 2025-11-08 09:40:40 +00:00
3 changed files with 4 additions and 4 deletions
Showing only changes of commit 1bcb2dbff7 - Show all commits

View File

@@ -70,7 +70,7 @@ export const handleConnectDispatch =
userId: user.id,
},
});
if (discordAccount?.id) {
if (discordAccount?.id && !ghostMode) {
await renameMember(
discordAccount.discordId.toString(),
`${getPublicUser(user).fullName}${selectedZone}`,
@@ -99,7 +99,7 @@ export const handleConnectDispatch =
io.to("dispatchers").emit("dispatchers-update");
io.to("pilots").emit("dispatchers-update");
if (discordAccount?.id) {
if (discordAccount?.id && !ghostMode) {
await renameMember(
discordAccount.discordId.toString(),
`${getPublicUser(user).fullName} - ${user.publicId}`,

View File

@@ -253,7 +253,7 @@ const MissionMarker = ({
tab: "home",
},
],
close: openMissionMarker?.map((m) => m.id) || [],
close: [],
});
}
};

View File

@@ -158,7 +158,7 @@ const PopupContent = ({
</span>
<span>
{aircraft.Station.bosCallsign.length > 15
? aircraft.Station.locationStateShort
? aircraft.Station.bosCallsignShort
: aircraft.Station.bosCallsign}
</span>
</div>