feat: add mitigation on nami namespace injection

Author: mchappell

src/api/migration-tool/migrator/migration-state.data.ts

@@ -8,4 +8,3 @@ export enum MigrationState {
 
 export const MIGRATION_KEY = 'laceMigration' as const;
 export const DISMISS_MIGRATION_UNTIL = 'dismissMigrationUntil' as const;
-export const IS_HAVING_ISSUES = 'isHavingIssues' as const;

src/pages/Content/index.js

@@ -16,10 +16,12 @@ const injectScript = () => {
 };
 
 async function shouldInject() {
-  const { laceMigration } = (await storage.local.get(MIGRATION_KEY)) || {
+  const { laceMigration } = (await storage.local.get([MIGRATION_KEY])) || {
     laceMigration: undefined,
   };
+
   // Prevent injection into window.cardano namespace if migration has been completed
+  // or if the user has dismissed because they are having issues migrating (setting migration state back to 'none')
   if (laceMigration === MigrationState.Completed) return false;
   const documentElement = document.documentElement.nodeName;
   const docElemCheck = documentElement

src/ui/lace-migration/components/migration-view/migration-view.component.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import {
   MigrationState,
-  IS_HAVING_ISSUES,
+  MIGRATION_KEY,
 } from '../../../../api/migration-tool/migrator/migration-state.data';
 import { Carousel } from '../carousel/carousel.component';
 import { Slide1 } from '../carousel/slides/Slide1.component';
@@ -50,7 +50,9 @@ export const MigrationView = ({
     featureFlags?.['show-having-issues-button'] || false;
 
   const handleHavingIssuesClick = () => {
-    storage.local.set({ [IS_HAVING_ISSUES]: true });
+    storage.local.set({
+      [MIGRATION_KEY]: MigrationState.None,
+    });
     captureEvent(Events.NamiMigrationHavingIssuesClick);
   };
 

src/ui/lace-migration/components/migration.component.jsx

@@ -4,7 +4,6 @@ import {
   MIGRATION_KEY,
   MigrationState,
   DISMISS_MIGRATION_UNTIL,
-  IS_HAVING_ISSUES,
 } from '../../../api/migration-tool/migrator/migration-state.data';
 import { MigrationView } from './migration-view/migration-view.component';
 import {
@@ -39,7 +38,6 @@ export const AppWithMigration = () => {
 
   useEffect(() => {
     storage.local.get().then((store) => {
-      console.log(store[IS_HAVING_ISSUES]);
       // Wait for Lace installation check before declaring UI to be ready
       checkLaceInstallation().then((laceInstalled) => {
         // Check if the wallet exists
@@ -51,7 +49,6 @@ export const AppWithMigration = () => {
             migrationState: store[MIGRATION_KEY] ?? MigrationState.None,
             hasWallet: typeof accounts !== 'undefined',
             dismissedUntil: store[DISMISS_MIGRATION_UNTIL] ?? undefined,
-            isHavingIssues: store[IS_HAVING_ISSUES] ?? false,
           }));
           // Capture events for initial migration state when Nami is opened
           switch (store[MIGRATION_KEY]) {
@@ -79,7 +76,6 @@ export const AppWithMigration = () => {
         migrationState: changes[MIGRATION_KEY]?.newValue ?? s.migrationState,
         dismissedUntil:
           changes[DISMISS_MIGRATION_UNTIL]?.newValue ?? s.dismissedUntil,
-        isHavingIssues: changes[IS_HAVING_ISSUES] ?? false,
       }));
     };
 
@@ -102,16 +98,7 @@ export const AppWithMigration = () => {
       isBetaProgramIsActive &&
       featureFlags?.['is-migration-active'] !== undefined;
 
-    const hasShowIssuesButton =
-      featureFlags?.['show-having-issues-button'] || false;
-
-    if (
-      state.migrationState === MigrationState.Completed &&
-      hasShowIssuesButton &&
-      state.isHavingIssues
-    ) {
-      showApp = true;
-    } else if (state.migrationState === MigrationState.Completed) {
+    if (state.migrationState === MigrationState.Completed) {
       showApp = false;
     } else if (isBetaProgramActiveAndUserEnrolled) {
       // Canary phase entry