f

src/screens/app.tsx

@@ -10,8 +10,14 @@ import { VersionWarning } from "./shared/version-warning.tsx";
 import React from "react";
 import { UserSettingsStoreProvider } from "../store/user-settings-store-context.tsx";
 import { UserSettingsMain } from "./user-settings/user-settings-main.tsx";
+import { deckListStore } from "../store/deck-list-store.ts";
+import { FullScreenLoader } from "./deck-list/full-screen-loader.tsx";
 
 export const App = observer(() => {
+  if (deckListStore.isSharedDeckLoading || deckListStore.isDeckRemoving) {
+    return <FullScreenLoader />;
+  }
+
   return (
     <div>
       <VersionWarning />

src/screens/deck-list/main-screen.tsx

@@ -14,17 +14,12 @@ import WebApp from "@twa-dev/sdk";
 import { assert } from "../../lib/typescript/assert.ts";
 import { ListHeader } from "../../ui/list-header.tsx";
 import { range } from "../../lib/array/range.ts";
-import { FullScreenLoader } from "./full-screen-loader.tsx";
 
 export const MainScreen = observer(() => {
   useMount(() => {
     deckListStore.loadFirstTime(WebApp.initDataUnsafe.start_param);
   });
 
-  if (deckListStore.isSharedDeckLoading) {
-    return <FullScreenLoader />;
-  }
-
   return (
     <div
       className={css({

src/store/deck-list-store.ts

@@ -208,6 +208,7 @@ export class DeckListStore {
 
     try {
       await removeDeckFromMine({ deckId: deck.id });
+      screenStore.go({ type: "main" });
       this.myInfo = fromPromise(myInfoRequest());
     } catch (e) {
       reportHandledError(`Unable to remove deck ${deck.id}`, e);