From 5503b8f292a1cb158b558cdf1edc916c879f1a27 Mon Sep 17 00:00:00 2001
From: David Dal Busco <david.dalbusco@outlook.com>
Date: Fri, 7 Feb 2025 07:22:39 +0100
Subject: [PATCH] feat: move assertion in try catch

---
 src/frontend/src/lib/services/topup.services.ts | 4 ++--
 src/frontend/src/lib/services/user.services.ts  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frontend/src/lib/services/topup.services.ts b/src/frontend/src/lib/services/topup.services.ts
index 4fbdf8ecc..b1ce5c676 100644
--- a/src/frontend/src/lib/services/topup.services.ts
+++ b/src/frontend/src/lib/services/topup.services.ts
@@ -31,8 +31,6 @@ export const topUp = async ({
 	canisterId: Principal;
 	onProgress: (progress: TopUpProgress | undefined) => void;
 }): Promise<{ success: 'ok' | 'error'; err?: unknown }> => {
-	assertNonNullish(identity, get(i18n).core.not_logged_in);
-
 	if (isNullish(missionControlId)) {
 		toasts.error({
 			text: get(i18n).errors.no_mission_control
@@ -58,6 +56,8 @@ export const topUp = async ({
 	}
 
 	try {
+		assertNonNullish(identity, get(i18n).core.not_logged_in);
+
 		const topUp = async () =>
 			await topUpApi({
 				canisterId,
diff --git a/src/frontend/src/lib/services/user.services.ts b/src/frontend/src/lib/services/user.services.ts
index a599c7eae..167d7c41e 100644
--- a/src/frontend/src/lib/services/user.services.ts
+++ b/src/frontend/src/lib/services/user.services.ts
@@ -21,11 +21,11 @@ interface OpenUserDetailParams {
 }
 
 export const openUserDetail = async ({ user, satelliteId, identity }: OpenUserDetailParams) => {
-	assertNonNullish(identity, get(i18n).core.not_logged_in);
+	try {
+		assertNonNullish(identity, get(i18n).core.not_logged_in);
 
-	busy.start();
+		busy.start();
 
-	try {
 		const waitLoadUserUsages = (): Promise<UserUsageCollection[]> =>
 			// eslint-disable-next-line no-async-promise-executor, require-await
 			new Promise<UserUsageCollection[]>(async (resolve, reject) => {