remove blockaid announcement modal

@shared/api/internal.ts

@@ -1206,7 +1206,6 @@ export const saveSettings = async ({
     settingsState: SettingsState.IDLE,
     isSorobanPublicEnabled: false,
     isNonSSLEnabled: false,
-    isBlockaidAnnounced: false,
     isHideDustEnabled: true,
     error: "",
   };
@@ -1530,24 +1529,3 @@ export const simulateTransaction = async (args: {
     response,
   };
 };
-
-export const saveIsBlockaidAnnounced = async ({
-  isBlockaidAnnounced,
-}: {
-  isBlockaidAnnounced: boolean;
-}) => {
-  let response = {
-    error: "",
-    isBlockaidAnnounced: false,
-  };
-
-  response = await sendMessageToBackground({
-    type: SERVICE_TYPES.SAVE_IS_BLOCKAID_ANNOUNCED,
-    isBlockaidAnnounced,
-  });
-
-  return {
-    isBlockaidAnnounced: response.isBlockaidAnnounced,
-    error: response.error,
-  };
-};

@shared/api/types.ts

@@ -92,7 +92,6 @@ export interface Response {
   isMergeSelected: boolean;
   recommendedFee: string;
   isNonSSLEnabled: boolean;
-  isBlockaidAnnounced: boolean;
   isHideDustEnabled: boolean;
 }
 
@@ -146,7 +145,6 @@ export interface Preferences {
   isMemoValidationEnabled: boolean;
   networksList: NetworkDetails[];
   isHideDustEnabled: boolean;
-  isBlockaidAnnounced: boolean;
   error: string;
 }
 

@shared/constants/services.ts

@@ -48,7 +48,6 @@ export enum SERVICE_TYPES {
   MIGRATE_ACCOUNTS = "MIGRATE_ACCOUNTS",
   ADD_ASSETS_LIST = "ADD_ASSETS_LIST",
   MODIFY_ASSETS_LIST = "MODIFY_ASSETS_LIST",
-  SAVE_IS_BLOCKAID_ANNOUNCED = "SAVE_IS_BLOCKAID_ANNOUNCED",
 }
 
 export enum EXTERNAL_SERVICE_TYPES {

extension/e2e-tests/helpers/login.ts

@@ -31,7 +31,6 @@ export const login = async ({ page, extensionId }) => {
   });
 
   await page.goto(`chrome-extension://${extensionId}/index.html#/account`);
-  await page.getByTestId("BlockaidAnnouncement__accept").click();
   await expect(page.getByTestId("network-selector-open")).toBeVisible({
     timeout: 10000,
   });
@@ -90,7 +89,6 @@ export const loginToTestAccount = async ({ page, extensionId }) => {
   });
 
   await page.goto(`chrome-extension://${extensionId}/index.html#/account`);
-  await page.getByTestId("BlockaidAnnouncement__accept").click();
   await expect(page.getByTestId("network-selector-open")).toBeVisible({
     timeout: 50000,
   });

extension/src/background/helpers/account.ts

@@ -11,7 +11,6 @@ import {
   ASSETS_LISTS_ID,
   IS_HASH_SIGNING_ENABLED_ID,
   IS_NON_SSL_ENABLED_ID,
-  IS_BLOCKAID_ANNOUNCED_ID,
   IS_HIDE_DUST_ENABLED_ID,
   LAST_USED_ACCOUNT,
 } from "constants/localStorageTypes";
@@ -156,16 +155,6 @@ export const getIsNonSSLEnabled = async () => {
   return isNonSSLEnabled;
 };
 
-export const getIsBlockaidAnnounced = async () => {
-  if (!(await localStore.getItem(IS_BLOCKAID_ANNOUNCED_ID))) {
-    await localStore.setItem(IS_BLOCKAID_ANNOUNCED_ID, false);
-  }
-  const isBlockaidAnnounced =
-    (await localStore.getItem(IS_BLOCKAID_ANNOUNCED_ID)) ?? false;
-
-  return isBlockaidAnnounced;
-};
-
 export const getIsHideDustEnabled = async () => {
   const isHideDustEnabled =
     (await localStore.getItem(IS_HIDE_DUST_ENABLED_ID)) ?? true;

extension/src/background/messageListener/popupMessageListener.ts

@@ -52,7 +52,6 @@ import {
   TOKEN_ID_LIST,
   IS_HASH_SIGNING_ENABLED_ID,
   IS_NON_SSL_ENABLED_ID,
-  IS_BLOCKAID_ANNOUNCED_ID,
   IS_HIDE_DUST_ENABLED_ID,
 } from "constants/localStorageTypes";
 import {
@@ -80,7 +79,6 @@ import {
   getNetworksList,
   getAssetsLists,
   getIsNonSSLEnabled,
-  getIsBlockaidAnnounced,
   getIsHideDustEnabled,
   HW_PREFIX,
   getBipPath,
@@ -1317,7 +1315,6 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
     const isHashSigningEnabled = await getIsHashSigningEnabled();
     const assetsLists = await getAssetsLists();
     const isNonSSLEnabled = await getIsNonSSLEnabled();
-    const isBlockaidAnnounced = await getIsBlockaidAnnounced();
     const isHideDustEnabled = await getIsHideDustEnabled();
 
     return {
@@ -1333,7 +1330,6 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
       userNotification,
       assetsLists,
       isNonSSLEnabled,
-      isBlockaidAnnounced,
       isHideDustEnabled,
     };
   };
@@ -1770,14 +1766,6 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
     return { assetsLists: await getAssetsLists() };
   };
 
-  const saveIsBlockaidAnnounced = async () => {
-    const { isBlockaidAnnounced } = request;
-
-    await localStore.setItem(IS_BLOCKAID_ANNOUNCED_ID, isBlockaidAnnounced);
-
-    return { isBlockaidAnnounced: await getIsBlockaidAnnounced() };
-  };
-
   const messageResponder: MessageResponder = {
     [SERVICE_TYPES.CREATE_ACCOUNT]: createAccount,
     [SERVICE_TYPES.FUND_ACCOUNT]: fundAccount,
@@ -1830,7 +1818,6 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
     [SERVICE_TYPES.MIGRATE_ACCOUNTS]: migrateAccounts,
     [SERVICE_TYPES.ADD_ASSETS_LIST]: addAssetsList,
     [SERVICE_TYPES.MODIFY_ASSETS_LIST]: modifyAssetsList,
-    [SERVICE_TYPES.SAVE_IS_BLOCKAID_ANNOUNCED]: saveIsBlockaidAnnounced,
   };
 
   return messageResponder[request.type]();

extension/src/popup/ducks/settings.ts

@@ -16,7 +16,6 @@ import {
   editCustomNetwork as editCustomNetworkService,
   addAssetsList as addAssetsListService,
   modifyAssetsList as modifyAssetsListService,
-  saveIsBlockaidAnnounced as saveIsBlockaidAnnouncedService,
 } from "@shared/api/internal";
 import {
   NETWORKS,
@@ -56,7 +55,6 @@ const settingsInitialState: Settings = {
   networksList: DEFAULT_NETWORKS,
   isMemoValidationEnabled: true,
   isHideDustEnabled: true,
-  isBlockaidAnnounced: false,
   error: "",
 };
 
@@ -274,29 +272,6 @@ export const modifyAssetsList = createAsyncThunk<
   },
 );
 
-export const saveIsBlockaidAnnounced = createAsyncThunk<
-  { isBlockaidAnnounced: boolean },
-  {
-    isBlockaidAnnounced: boolean;
-  },
-  { rejectValue: ErrorMessage }
->(
-  "settings/saveIsBlockaidAnnounced",
-  async ({ isBlockaidAnnounced }, thunkApi) => {
-    const res = await saveIsBlockaidAnnouncedService({
-      isBlockaidAnnounced,
-    });
-
-    if (res.error) {
-      return thunkApi.rejectWithValue({
-        errorMessage: res.error || "Unable to save isBlockaidAnnounced",
-      });
-    }
-
-    return res;
-  },
-);
-
 const settingsSlice = createSlice({
   name: "settings",
   initialState,
@@ -396,7 +371,6 @@ const settingsSlice = createSlice({
           userNotification,
           assetsLists,
           isNonSSLEnabled,
-          isBlockaidAnnounced,
           isHideDustEnabled,
         } = action?.payload || {
           ...initialState,
@@ -416,7 +390,6 @@ const settingsSlice = createSlice({
           userNotification,
           assetsLists,
           isNonSSLEnabled,
-          isBlockaidAnnounced,
           isHideDustEnabled,
           settingsState: SettingsState.SUCCESS,
         };
@@ -562,24 +535,6 @@ const settingsSlice = createSlice({
         };
       },
     );
-    builder.addCase(
-      saveIsBlockaidAnnounced.fulfilled,
-      (
-        state,
-        action: PayloadAction<{
-          isBlockaidAnnounced: boolean;
-        }>,
-      ) => {
-        const { isBlockaidAnnounced } = action?.payload || {
-          isBlockaidAnnounced: initialState.isBlockaidAnnounced,
-        };
-
-        return {
-          ...state,
-          isBlockaidAnnounced,
-        };
-      },
-    );
   },
 });
 

extension/src/popup/views/Account/index.tsx

@@ -51,7 +51,6 @@ import { AccountOptionsDropdown } from "popup/components/account/AccountOptionsD
 import { AssetDetail } from "popup/components/account/AssetDetail";
 import { Loading } from "popup/components/Loading";
 import { NotFundedMessage } from "popup/components/account/NotFundedMessage";
-import { BlockaidAnnouncement } from "popup/components/account/BlockaidAnnouncement";
 
 import "popup/metrics/authServices";
 
@@ -178,7 +177,6 @@ export const Account = () => {
             publicKey={publicKey}
             setLoading={setLoading}
           />
-          <BlockaidAnnouncement />
           <View.Content hasNoTopPadding>
             <div className="AccountView" data-testid="account-view">
               <div className="AccountView__account-actions">