Make bike ghost adding fail earlier

Author: ttmx

src/lib/components/Bike.svelte

@@ -21,7 +21,7 @@
 		battery?: number|null;
 		dock: string|null;
 		disabled?: boolean;
-		serial: string|null;
+		serial: string;
 		station: StationInfo;
 	}
 

src/lib/components/ErrorMessage.svelte

@@ -4,7 +4,7 @@
 	import { fly } from 'svelte/transition';
 </script>
 
-<div class="flex flex-col pointer-events-none z-50 absolute bottom-10 left-1/2 -translate-x-1/2 items-center gap-2">
+<div class="flex flex-col pointer-events-none z-[110] absolute bottom-10 left-1/2 -translate-x-1/2 items-center gap-2">
 	{#each $errorMessages as error (error.id)}
 		<div animate:flip={{ duration: 400 }} transition:fly={{ y: 80 }} class="bg-warning py-2 px-3 font-bold text-sm text-background rounded-xl w-max max-w-[85vw]">
 			{error.msg}

src/lib/components/StationMenu.svelte

@@ -2,6 +2,7 @@
 	import Bike from '$lib/components/Bike.svelte';
 	import BikeSkeleton from '$lib/components/BikeSkeleton.svelte';
 	import { getStationInfo } from '$lib/gira-api/api';
+	import { IdToSerial } from '$lib/gira-api/bikeMapping';
 	import { currentPos } from '$lib/location';
 	import { selectedStation, stations } from '$lib/map.svelte';
 	import { t } from '$lib/translations';
@@ -49,7 +50,7 @@
 		return undefined;
 	});
 
-	let bikeInfo:({type:'electric'|'classic', id:string, battery:number|null, dock:string, serial:string}|{id:string})[] = $state([]);
+	let bikeInfo:({type:'electric'|'classic', id:string, battery:number|null, dock:string, serial:string}|{id:string, serial: string})[] = $state([]);
 	function isRealBike(bike: typeof bikeInfo[number]): bike is {type:'electric'|'classic', id:string, battery:number|null, dock:string, serial:string} {
 		return 'type' in bike === true;
 	}
@@ -182,19 +183,21 @@
 	const makeExtraBikeFunction = (dismiss: () => void) => {
 		return async () => {
 			await tick();
-			if (bikeIdNumber === null || bikeIdNumber > 10000 || bikeIdNumber < 0) {
+			if (bikeId === null) {
 				errorMessages.add(
 					$t('bike_unlock_invalid_id_error'),
 					2000,
 				);
 				return;
 			}
-			if (bikeId) bikeInfo.push({ id: bikeId });
+			let serial = IdToSerial.get(bikeId);
+			if (serial) bikeInfo.push({ id: bikeId, serial: serial });
 			else {
 				errorMessages.add(
 					$t('bike_unlock_no_serial_error'),
 					3000,
 				);
+				return;
 			}
 			dismiss();
 			await tick();
@@ -282,7 +285,7 @@
 						{#if isRealBike(bike)}
 							<Bike type={bike.type} id={bike.id} battery={bike.battery} dock={bike.dock} serial={bike.serial} disabled={isScrolling} station={station} />
 						{:else}
-							<Bike type={null} id={bike.id} battery={null} dock={null} serial={null} disabled={isScrolling} station={station} />
+							<Bike type={null} id={bike.id} battery={null} dock={null} serial={bike.serial} disabled={isScrolling} station={station} />
 						{/if}
 
 					{/each}

src/lib/trip.ts

@@ -60,15 +60,15 @@ async function checkTripStarted(serial: string) {
  * @param station 
  * @returns True if the trip was started successfully, false otherwise
  */
-export async function tryStartTrip(id: string, serial: string|null, station: StationInfo): Promise<boolean> {
-	if (serial == null){
-		serial = IdToSerial.get(id) ?? null;
-	}
-	if (serial == null) {
-		errorMessages.add(get(t)('bike_unlock_no_serial_error'));
-		reportErrorEvent('bike_unlock_no_serial_error', id);
-		return false;
-	}
+export async function tryStartTrip(id: string, serial: string, station: StationInfo): Promise<boolean> {
+	// if (serial == null){
+	// 	serial = IdToSerial.get(id) ?? null;
+	// }
+	// if (serial == null) {
+	// 	errorMessages.add(get(t)('bike_unlock_no_serial_error'));
+	// 	reportErrorEvent('bike_unlock_no_serial_error', id);
+	// 	return false;
+	// }
 	try {
 		if (get(appSettings).distanceLock) {
 			const pos = get(currentPos);