diff --git a/dashboard/src/App.tsx b/dashboard/src/App.tsx
index 967b943..bb38b34 100644
--- a/dashboard/src/App.tsx
+++ b/dashboard/src/App.tsx
@@ -32,18 +32,10 @@ export function App() {
       <div className="app__theme-bar">
         <ThemeToggle theme={theme} onToggle={toggleTheme} />
       </div>
-  | 'preferences';
-
-export function App() {
-  const [tab, setTab] = useState<Tab>('explorer');
-
-  return (
-    <div className="app">
       <nav className="app-tabs" role="tablist" aria-label="Main navigation">
         <button
           type="button"
           role="tab"
-          type="button"
           aria-selected={tab === 'explorer'}
           className={`app-tabs__btn${tab === 'explorer' ? ' app-tabs__btn--active' : ''}`}
           onClick={() => setTab('explorer')}
@@ -53,7 +45,6 @@ export function App() {
         <button
           type="button"
           role="tab"
-          type="button"
           aria-selected={tab === 'timeline'}
           className={`app-tabs__btn${tab === 'timeline' ? ' app-tabs__btn--active' : ''}`}
           onClick={() => setTab('timeline')}
@@ -63,7 +54,6 @@ export function App() {
         <button
           type="button"
           role="tab"
-          type="button"
           aria-selected={tab === 'activity'}
           className={`app-tabs__btn${tab === 'activity' ? ' app-tabs__btn--active' : ''}`}
           onClick={() => setTab('activity')}
@@ -73,7 +63,6 @@ export function App() {
         <button
           type="button"
           role="tab"
-          type="button"
           aria-selected={tab === 'webhooks'}
           className={`app-tabs__btn${tab === 'webhooks' ? ' app-tabs__btn--active' : ''}`}
           onClick={() => setTab('webhooks')}
@@ -83,7 +72,6 @@ export function App() {
         <button
           type="button"
           role="tab"
-          type="button"
           aria-selected={tab === 'export-history'}
           className={`app-tabs__btn${tab === 'export-history' ? ' app-tabs__btn--active' : ''}`}
           onClick={() => setTab('export-history')}
@@ -93,7 +81,6 @@ export function App() {
         <button
           type="button"
           role="tab"
-          type="button"
           aria-selected={tab === 'search'}
           className={`app-tabs__btn${tab === 'search' ? ' app-tabs__btn--active' : ''}`}
           onClick={() => setTab('search')}
@@ -101,8 +88,6 @@ export function App() {
           Notification Search
         </button>
         <button
-          role="tab"
-          type="button"
           type="button"
           role="tab"
           aria-selected={tab === 'preferences'}
@@ -112,8 +97,8 @@ export function App() {
           Preferences
         </button>
         <button
-          role="tab"
           type="button"
+          role="tab"
           aria-selected={tab === 'templates'}
           className={`app-tabs__btn${tab === 'templates' ? ' app-tabs__btn--active' : ''}`}
           onClick={() => setTab('templates')}
diff --git a/dashboard/src/__tests__/wallet-integration.test.tsx b/dashboard/src/__tests__/wallet-integration.test.tsx
index 18ea4fe..dcccf6f 100644
--- a/dashboard/src/__tests__/wallet-integration.test.tsx
+++ b/dashboard/src/__tests__/wallet-integration.test.tsx
@@ -10,7 +10,6 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 const WALLET_ID_KEY = 'notify-chain:wallet-id';
-const WALLET_ADDRESS_KEY = 'notify-chain:wallet-address';
 const REPORT_PATH = path.join(process.cwd(), 'reports', 'wallet-integration.json');
 
 type KitMock = typeof import('../test/stellarWalletsKitMock');
@@ -239,7 +238,7 @@ describe('Notification feed clears on wallet switch (issue #175)', () => {
     await wallet.disconnectWallet();
 
     expect(store.useWalletStore.getState().address).toBeNull();
-    expect(localStorage.getItem(WALLET_ADDRESS_KEY)).toBeNull();
+    expect(localStorage.getItem('notify-chain:wallet-address')).toBeNull();
   });
 
   it('no stale address remains in localStorage after switching wallets', async () => {
@@ -258,8 +257,8 @@ describe('Notification feed clears on wallet switch (issue #175)', () => {
     await wallet.connectWallet();
 
     // localStorage must reflect the new account only
-    expect(localStorage.getItem(WALLET_ADDRESS_KEY)).toBe(SUPPORTED_WALLETS[2].address);
-    expect(localStorage.getItem(WALLET_ADDRESS_KEY)).not.toBe(SUPPORTED_WALLETS[0].address);
+    expect(localStorage.getItem('notify-chain:wallet-address')).toBe(SUPPORTED_WALLETS[2].address);
+    expect(localStorage.getItem('notify-chain:wallet-address')).not.toBe(SUPPORTED_WALLETS[0].address);
     expect(store.useWalletStore.getState().address).toBe(SUPPORTED_WALLETS[2].address);
   });
 
@@ -283,7 +282,7 @@ describe('Notification feed clears on wallet switch (issue #175)', () => {
       await wallet.connectWallet();
 
       expect(store.useWalletStore.getState().address).toBe(provider.address);
-      expect(localStorage.getItem(WALLET_ADDRESS_KEY)).toBe(provider.address);
+      expect(localStorage.getItem('notify-chain:wallet-address')).toBe(provider.address);
       expect(localStorage.getItem(WALLET_ID_KEY)).toBe(provider.id);
 
       localStorage.clear();
diff --git a/dashboard/src/hooks/useWalletAccountSync.ts b/dashboard/src/hooks/useWalletAccountSync.ts
index fe339cb..170621b 100644
--- a/dashboard/src/hooks/useWalletAccountSync.ts
+++ b/dashboard/src/hooks/useWalletAccountSync.ts
@@ -9,7 +9,7 @@ import { useWalletStore } from '../store/walletStore';
  * its initial value) — it fires only for subsequent transitions, i.e. a real
  * wallet switch or disconnect while the page is open.
  */
-export function useWalletAccountSync(onAccountChange: (address: string | null) => void): void {
+export function useWalletAccountSync(onAccountChange: () => void): void {
   const address = useWalletStore((state) => state.address);
 
   // Track whether this is the very first render so we can skip it.
@@ -24,6 +24,6 @@ export function useWalletAccountSync(onAccountChange: (address: string | null) =
       isFirstRender.current = false;
       return;
     }
-    callbackRef.current(address);
+    callbackRef.current();
   }, [address]);
 }
diff --git a/dashboard/src/pages/NotificationSearchPage.test.tsx b/dashboard/src/pages/NotificationSearchPage.test.tsx
index 008d1ae..c883f4c 100644
--- a/dashboard/src/pages/NotificationSearchPage.test.tsx
+++ b/dashboard/src/pages/NotificationSearchPage.test.tsx
@@ -1,35 +1,3 @@
-import { render, screen, fireEvent, waitFor, act } from '@testing-library/react';
-import { NotificationSearchPage } from './NotificationSearchPage';
-import * as eventsApi from '../services/eventsApi';
-
-jest.mock('../services/eventsApi', () => {
-  const actual = jest.requireActual('../services/eventsApi') as typeof import('../services/eventsApi');
-  return {
-    ...actual,
-    searchNotifications: jest.fn(),
-  };
-});
-
-const searchNotifications = eventsApi.searchNotifications as jest.MockedFunction<
-  typeof eventsApi.searchNotifications
->;
-
-function emptyResponse(): eventsApi.NotificationSearchResponse {
-  return {
-    results: [],
-    total: 0,
-    limit: 20,
-    offset: 0,
-    itemCount: 0,
-    totalPages: 0,
-  };
-}
-
-describe('NotificationSearchPage filters', () => {
-  beforeEach(() => {
-    jest.useFakeTimers();
-    searchNotifications.mockReset();
-    searchNotifications.mockResolvedValue(emptyResponse());
 import '@testing-library/jest-dom';
 import { render, screen, waitFor, fireEvent, act } from '@testing-library/react';
 import { NotificationSearchPage } from './NotificationSearchPage';
@@ -64,6 +32,17 @@ const mockResult: NotificationSearchResponse = {
   totalPages: 1,
 };
 
+function emptyResponse(): NotificationSearchResponse {
+  return {
+    results: [],
+    total: 0,
+    limit: 20,
+    offset: 0,
+    itemCount: 0,
+    totalPages: 0,
+  };
+}
+
 describe('NotificationSearchPage loading skeletons', () => {
   beforeEach(() => {
     mockedSearch.mockReset();
@@ -121,7 +100,7 @@ describe('NotificationSearchPage loading skeletons', () => {
   });
 
   it('updates results when filters change', async () => {
-    searchNotifications.mockResolvedValue({
+    mockedSearch.mockResolvedValue({
       results: [
         {
           id: 1,
@@ -182,42 +161,7 @@ describe('NotificationSearchPage loading skeletons', () => {
     expect(screen.getByLabelText(/filter from date/i)).toHaveValue('');
     expect(screen.queryByRole('button', { name: /clear all filters/i })).not.toBeInTheDocument();
   });
-});
 
-describe('searchNotifications query params', () => {
-  const originalFetch = global.fetch;
-
-  beforeEach(() => {
-    global.fetch = jest.fn().mockResolvedValue({
-      ok: true,
-      json: async () => emptyResponse(),
-    });
-  });
-
-  afterEach(() => {
-    global.fetch = originalFetch;
-  });
-
-  it('appends type, status, startDate, and endDate to the URL', async () => {
-    // Use the real implementation (not the page mock)
-    const { searchNotifications: realSearch } = jest.requireActual(
-      '../services/eventsApi'
-    ) as typeof import('../services/eventsApi');
-
-    await realSearch('http://localhost:8787', {
-      type: 'webhook',
-      status: 'COMPLETED',
-      startDate: '2026-01-01',
-      endDate: '2026-01-31',
-    });
-
-    expect(global.fetch).toHaveBeenCalledWith(
-      expect.stringContaining('type=webhook')
-    );
-    const calledUrl = (global.fetch as jest.Mock).mock.calls[0][0] as string;
-    expect(calledUrl).toContain('status=COMPLETED');
-    expect(calledUrl).toContain('startDate=2026-01-01');
-    expect(calledUrl).toContain('endDate=2026-01-31');
   it('shows result-card skeletons while searching and hides Searching text', async () => {
     mockedSearch.mockReturnValue(new Promise(() => {}));
 
@@ -274,3 +218,39 @@ describe('searchNotifications query params', () => {
     expect(document.querySelector('.notif-result-card__status')).toHaveTextContent('PENDING');
   });
 });
+
+describe('searchNotifications query params', () => {
+  const originalFetch = global.fetch;
+
+  beforeEach(() => {
+    global.fetch = jest.fn().mockResolvedValue({
+      ok: true,
+      json: async () => emptyResponse(),
+    });
+  });
+
+  afterEach(() => {
+    global.fetch = originalFetch;
+  });
+
+  it('appends type, status, startDate, and endDate to the URL', async () => {
+    const { searchNotifications: realSearch } = jest.requireActual(
+      '../services/eventsApi'
+    ) as typeof import('../services/eventsApi');
+
+    await realSearch('http://localhost:8787', {
+      type: 'webhook',
+      status: 'COMPLETED',
+      startDate: '2026-01-01',
+      endDate: '2026-01-31',
+    });
+
+    expect(global.fetch).toHaveBeenCalledWith(
+      expect.stringContaining('type=webhook')
+    );
+    const calledUrl = (global.fetch as jest.Mock).mock.calls[0][0] as string;
+    expect(calledUrl).toContain('status=COMPLETED');
+    expect(calledUrl).toContain('startDate=2026-01-01');
+    expect(calledUrl).toContain('endDate=2026-01-31');
+  });
+});
diff --git a/dashboard/src/pages/NotificationSearchPage.tsx b/dashboard/src/pages/NotificationSearchPage.tsx
index bf0655c..9e1731f 100644
--- a/dashboard/src/pages/NotificationSearchPage.tsx
+++ b/dashboard/src/pages/NotificationSearchPage.tsx
@@ -2,7 +2,6 @@ import { useState, useCallback, useEffect, useRef } from 'react';
 import { NotificationSearchSkeleton } from '../components/NotificationSearchSkeleton';
 import { getEventsApiBaseUrl } from '../config/eventsApiUrl';
 import { useDebounce } from '../hooks/useDebounce';
-import { getEventsApiBaseUrl } from '../config/eventsApiUrl';
 import {
   searchNotifications,
   type NotificationSearchResult,
@@ -31,9 +30,6 @@ export const NOTIFICATION_TYPE_OPTIONS = [
   { value: 'webhook', label: 'Webhook' },
   { value: 'sms', label: 'SMS' },
 ];
-const API_BASE = getEventsApiBaseUrl();
-
-const STATUS_OPTIONS = ['', 'PENDING', 'PROCESSING', 'COMPLETED', 'FAILED', 'CANCELLED', 'PROCESSED'];
 
 export function NotificationSearchPage() {
   const [query, setQuery] = useState('');