Merge branch 'main' into feat/progress-hosting

junobuild · Feb 7, 2025 · 0f388d1 · 0f388d1
2 parents 8626adf + 5503b8f
commit 0f388d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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) => {