Merge branch 'master' of github.com:coinos/coinos-ui-v2

1 files changed, 10 insertions, 5 deletions

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 42d249f4..5cc75b30 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -3,7 +3,7 @@
 	import '../app.css';
 	import { onMount } from 'svelte';
 	import { connect } from '$lib/socket';
-	import { selectedRate, rate } from '$lib/store';
+	import { selectedRate, rate, user } from '$lib/store';
 	import { page } from '$app/stores';
 	import { browser } from '$app/environment';
 	import { goto } from '$app/navigation';
@@ -14,12 +14,17 @@
 	const localeLocalStorageKey = 'sveltekit-i18n-locale';
 
 	export let data;
-	let { user, rate: r, token, rates } = data;
+
+	let r, u, token, rates;
+
 	$: update(data);
-	let update = () => ({ user, rate: r, token, rates } = data);
-	$rate = r;
+	let update = () => {
+		({ user: u, rate: r, token, rates } = data);
+		$rate = r;
+		$user = u;
+	};
 
-	$: $selectedRate = user && $rate * (rates[user.currency] / rates.USD);
+	$: $selectedRate = u && r * (rates[u.currency] / rates.USD);
 
 	onMount(() => {
 		let localStorageLocale = localStorage.getItem(localeLocalStorageKey);