improve merchant page loading and rm last splash

src/components/MerchantEvent.svelte

@@ -4,7 +4,7 @@
 	import Time from 'svelte-time';
 
 	export let action: EventType;
-	export let user: User | '';
+	export let user: User | undefined;
 	export let time: string;
 	export let latest: boolean;
 

src/lib/comp.ts

@@ -29,7 +29,6 @@ export { default as LatestTagger } from '../components/LatestTagger.svelte';
 export { default as LeaderboardItem } from '../components/LeaderboardItem.svelte';
 export { default as LeaderboardSkeleton } from '../components/LeaderboardSkeleton.svelte';
 export { default as LoadingSpinner } from '../components/LoadingSpinner.svelte';
-export { default as LoadingSplash } from '../components/LoadingSplash.svelte';
 export { default as MapLoadingEmbed } from '../components/MapLoadingEmbed.svelte';
 export { default as MapLoadingMain } from '../components/MapLoadingMain.svelte';
 export { default as MerchantButton } from '../components/MerchantButton.svelte';

src/lib/map/setup.ts

@@ -1,6 +1,6 @@
 import { InfoTooltip } from '$lib/comp';
 import { boost, exchangeRate, resetBoost, showMore, showTags, theme } from '$lib/store';
-import type { DomEventType, ElementOSM, Leaflet, OSMTags } from '$lib/types';
+import type { DomEventType, ElementOSM, Leaflet, OSMTags, PayMerchant } from '$lib/types';
 import { detectTheme, errToast } from '$lib/utils';
 import axios from 'axios';
 import axiosRetry from 'axios-retry';
@@ -651,7 +651,7 @@ export const generateMarker = (
 	long: number,
 	icon: DivIcon,
 	element: ElementOSM,
-	payment: { type: string; url?: string; username?: string } | undefined,
+	payment: PayMerchant,
 	L: Leaflet,
 	verifiedDate: number,
 	verify: boolean,

src/lib/types.ts

@@ -175,6 +175,8 @@ export interface SearchResult extends SearchElement {
 	distanceMi: number;
 }
 
+export type PayMerchant = { type: string; url?: string; username?: string } | undefined;
+
 // leaderboards
 
 export type TaggerLeaderboard = {