fix(nami): [lw-11981] remove preloader for nami migration (#1599)

input-output-hk · Dec 17, 2024 · 89b1544 · 89b1544
1 parent adba716
commit 89b1544
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/apps/browser-extension-wallet/src/features/nami-migration/NamiMigration.tsx b/apps/browser-extension-wallet/src/features/nami-migration/NamiMigration.tsx
@@ -15,6 +15,10 @@ const urlPath = walletRoutePaths.namiMigration;
 export const NamiMigration = (): JSX.Element => {
   const analytics = useAnalyticsContext();
 
+  useEffect(() => {
+    document.querySelector('#preloader')?.remove();
+  }, []);
+
   useEffect(() => {
     analytics.sendEventToPostHog(postHogNamiMigrationActions.onboarding.OPEN);
   }, [analytics]);

diff --git a/apps/browser-extension-wallet/src/views/browser-view/routes/index.tsx b/apps/browser-extension-wallet/src/views/browser-view/routes/index.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable max-statements */
 /* eslint-disable complexity */
 /* eslint-disable no-magic-numbers */
 import React, { useEffect, useState, ComponentType, useMemo } from 'react';
@@ -205,13 +206,18 @@ export const BrowserViewRoutes = ({ routesMap = defaultRoutes }: { routesMap?: R
     [areExperimentsLoading, isLoadingWalletInfo, deletingWallet, cardanoWallet, stayOnAllDonePage]
   );
 
+  const isInNamiMode = useMemo(
+    () => namiMigration?.mode === 'nami' && !isLoadingWalletInfo && cardanoWallet,
+    [cardanoWallet, isLoadingWalletInfo, namiMigration?.mode]
+  );
+
   useEffect(() => {
-    if (isLoaded || isOnboarding) {
+    if (isLoaded || isOnboarding || isInNamiMode) {
       document.querySelector('#preloader')?.remove();
     }
-  }, [isLoaded, isOnboarding]);
+  }, [isLoaded, isOnboarding, isInNamiMode]);
 
-  if (namiMigration?.mode === 'nami' && !isLoadingWalletInfo && cardanoWallet) {
+  if (isInNamiMode) {
     return (
       <Lock
         message={t('general.lock.namiMode.message')}