going full courtside

2026-02-27 17:33:40 -05:00
89 changed files with 5904 additions and 8056 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +0,0 @@
-.git
-node_modules
-.DS_Store
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,15 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[Makefile]
-indent_style = tab
-
-[*.go]
-indent_style = tab
--- a/.gitea/workflows/check.yml
+++ b/.gitea/workflows/check.yml
@@ -1,9 +0,0 @@
-name: check
-on: [push]
-jobs:
-    check:
-        runs-on: ubuntu-latest
-        steps:
-            # actions/checkout v4.2.2, 2026-02-22
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-            - run: docker build .
--- a/.gitignore
+++ b/.gitignore
@@ -1,45 +0,0 @@
-# OS
-.DS_Store
-Thumbs.db
-
-# Editors
-*.swp
-*.swo
-*~
-*.bak
-.idea/
-.vscode/
-*.sublime-*
-
-# Node
-node_modules/
-
-# Environment / secrets
-.env
-.env.*
-*.pem
-*.key
-
-# Go build artifacts
-backend-go/bin/
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-*.test
-*.out
-vendor/
-tmp/
-
-# Frontend build output
-frontend/dist/
-frontend/build/
-frontend/.vite/
-
-# Prompts directory (local tooling, not part of the project)
-Prompts/
-
-# Logs
-*.log
-.claude
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,7 +0,0 @@
-node_modules/
-frontend/dist/
-frontend/build/
-backend-go/bin/
-*.lock
-Prompts/
-.claude/
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,4 +0,0 @@
-{
-    "tabWidth": 4,
-    "proseWrap": "always"
-}
--- a/22
+++ b/22
@@ -1,22 +0,0 @@
-# syntax=docker/dockerfile:1
-
-# golang:1.24-alpine, 2025-02-28
-FROM golang:1.24-alpine@sha256:8bee1901f1e530bfb4a7850aa7a479d17ae3a18beb6e09064ed54cfd245b7191
-
-# Install system dependencies: Node.js, npm, make, git
-RUN apk add --no-cache nodejs npm make git
-
-# Install golangci-lint at a pinned commit hash
-# golangci-lint v2.10.1 (2025-02-17), commit 5d1e709b7be35cb2025444e19de266b056b7b7ee
-RUN GOBIN=/usr/local/bin go install \
-    github.com/golangci/golangci-lint/cmd/golangci-lint@5d1e709b7be35cb2025444e19de266b056b7b7ee
-
-WORKDIR /app
-
-COPY . .
-
-# Install frontend dependencies
-RUN cd frontend && npm ci
-
-# Run all checks — build fails if the branch is not green
-RUN make check
--- a/21
+++ b/21
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Steven Jannette
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/90
+++ b/90
@@ -1,90 +0,0 @@
-.PHONY: test lint fmt fmt-check check docker hooks build run dev clean \
-        test-go test-js lint-go lint-js fmt-go fmt-js fmt-check-go fmt-check-js \
-        build-go build-js
-
-GODIR    := backend-go
-JSDIR    := frontend
-PRETTIER := $(JSDIR)/node_modules/.bin/prettier
-
-# ── required targets ────────────────────────────────────────────
-
-all: check
-
-check: test lint fmt-check
-
-test: test-go test-js
-
-lint: lint-go lint-js
-
-fmt: fmt-go fmt-js
-
-fmt-check: fmt-check-go fmt-check-js
-
-# ── go ──────────────────────────────────────────────────────────
-
-test-go:
-	cd $(GODIR) && go test -timeout 30s ./...
-
-lint-go:
-	cd $(GODIR) && golangci-lint run ./...
-
-fmt-go:
-	cd $(GODIR) && gofmt -w .
-
-fmt-check-go:
-	@diff=$$(cd $(GODIR) && gofmt -l .); \
-	if [ -n "$$diff" ]; then \
-		echo "Go files need formatting:"; \
-		echo "$$diff"; \
-		exit 1; \
-	fi
-
-# ── js / frontend ───────────────────────────────────────────────
-
-test-js:
-	cd $(JSDIR) && npm test
-
-lint-js:
-	$(PRETTIER) --check '**/*.{js,jsx,ts,tsx,css,md,json}'
-
-fmt-js:
-	$(PRETTIER) --write '**/*.{js,jsx,ts,tsx,css,md,json}'
-
-fmt-check-js:
-	$(PRETTIER) --check '**/*.{js,jsx,ts,tsx,css,md,json}'
-
-# ── build ───────────────────────────────────────────────────────
-
-build: build-go build-js
-
-build-go:
-	cd $(GODIR) && go build -o bin/api ./cmd/api
-	cd $(GODIR) && go build -o bin/poller ./cmd/poller
-
-build-js:
-	cd $(JSDIR) && npm run build
-
-# ── dev / run ───────────────────────────────────────────────────
-
-run:
-	cd $(GODIR) && go run ./cmd/api
-
-dev:
-	cd $(GODIR) && go run ./cmd/api
-
-# ── docker ──────────────────────────────────────────────────────
-
-docker:
-	docker build -t koin-ping .
-
-# ── hooks ───────────────────────────────────────────────────────
-
-hooks:
-	printf '#!/bin/sh\nmake check\n' > .git/hooks/pre-commit
-	chmod +x .git/hooks/pre-commit
-
-# ── clean ───────────────────────────────────────────────────────
-
-clean:
-	rm -rf $(GODIR)/bin/
-	rm -rf $(JSDIR)/dist/
--- a/README.md
+++ b/README.md
@@ -1,155 +1,95 @@
 # Koin Ping
+
 A lightweight on-chain monitoring and alerting system designed to give users situational awareness over blockchain addresses they care about.

-# Overview
+## Overview

-Koin Ping observes on-chain activity and notifies users when predefined conditions are met. It does not execute transactions, manage wallets, or speculate on prices.
+Koin Ping is designed to reliably observe on-chain activity and notify users when predefined conditions are met. It does not execute transactions, manage wallets, or speculate on prices.

+## Project Structure
+
+```
+koin_ping/
+├── backend/                  # Node.js + Express + PostgreSQL backend
+│   ├── api/                 # API endpoints and server configuration
+│   ├── poller/              # Blockchain polling logic
+│   ├── alerts/              # Alert evaluation and management
+│   ├── notifications/       # Notification delivery system
+│   ├── domain/              # Domain models and business logic
+│   ├── infra/               # Infrastructure (database, external services)
+│   └── shared/              # Shared utilities and helpers
+│
+└── frontend/                 # React + Vite frontend
+    ├── public/              # Static assets
+    └── src/
+        ├── api/             # Frontend API calls to backend
+        ├── components/      # Reusable UI components
+        ├── pages/           # Top-level pages (views)
+        └── utils/           # Utility functions
+
+```
+
+## Tech Stack
+
+### Backend
+- **Runtime:** Node.js
+- **Framework:** Express
+- **Database:** PostgreSQL
+- **Key Dependencies:** 
+  - `pg` - PostgreSQL client
+  - `dotenv` - Environment variable management
+  - `cors` - CORS middleware
+  - `nodemon` - Development auto-reload
+
+### Frontend
+- **Framework:** React 19
+- **Build Tool:** Vite
+- **Language:** JavaScript/TypeScript (mixed)
+- **Type Checking:** TypeScript

 ## Getting Started

 ### Prerequisites
+- Node.js (v18 or higher recommended)
+- PostgreSQL database
+- npm or yarn

- Go 1.24+
- Node.js 18+ and npm (or yarn — preferred per repo policy)
- PostgreSQL 15+
- `golangci-lint` v2 (for `make lint`)
-
-### Setup
+### Backend Setup

+1. Navigate to the backend directory:
   ```bash
-# Clone and enter the repo
-git clone <repo-url>
-cd koin_ping_0.2.0
-
-# Install pre-commit hook
-make hooks
-
-# Install frontend dependencies
-cd frontend && npm install && cd ..
-
-# Copy and fill in environment variables
-cp backend-go/.env.example backend-go/.env
-# edit backend-go/.env with your DATABASE_URL, FIREBASE_PROJECT_ID, ETH_RPC_URL
-
-# Run checks (requires golangci-lint)
-make check
-
-# Start the API server
-make run
-
-# Start the poller (separate terminal)
-cd backend-go && go run ./cmd/poller
-
-# Start the frontend dev server (separate terminal)
-cd frontend && npm run dev
+   cd backend
   ```

-The API listens on `http://localhost:3001` and the frontend on
-`http://localhost:3000` by default.
-
-## Rationale
-
-Crypto users who hold or actively monitor addresses need a lightweight, reliable
-way to know when on-chain activity occurs without polling block explorers
-manually. Koin Ping fills that gap: it watches a set of Ethereum addresses,
-evaluates configurable alert rules (incoming transactions, outgoing
-transactions, large transfers, balance thresholds), and notifies the user
-through Discord webhooks.
-
-## Design
-
-The system is split into two independently deployable processes and one
-frontend:
-
-```
-koin_ping_0.2.0/
-├── backend-go/                # Go monorepo root
-│   ├── cmd/api/               # HTTP REST API server
-│   ├── cmd/poller/            # Blockchain polling daemon
-│   └── internal/
-│       ├── config/            # Environment-based config loading
-│       ├── database/          # pgx connection pool
-│       ├── domain/            # Shared domain types
-│       ├── firebase/          # Firebase auth client
-│       ├── handlers/          # HTTP handler wiring
-│       ├── middleware/         # Auth middleware
-│       ├── models/            # SQL persistence layer
-│       ├── notifications/     # Discord webhook delivery
-│       ├── protocols/ethereum/ # Ethereum JSON-RPC client
-│       ├── services/          # Observer and evaluator business logic
-│       └── wei/               # ETH/Wei conversion utilities
-└── frontend/                  # React + Vite SPA
-    └── src/
-        ├── api/               # Fetch wrappers for the REST API
-        ├── components/        # Reusable UI components
-        ├── contexts/          # React contexts (auth, etc.)
-        ├── firebase/          # Firebase SDK initialization
-        └── pages/             # Top-level route pages
+2. Install dependencies (already done):
+   ```bash
+   npm install
   ```

-**API server** (`cmd/api`): standard-library `net/http` with Firebase JWT
-authentication middleware. Exposes CRUD endpoints for addresses, alert rules,
-alert events, and notification configuration.
+3. Create a `.env` file (see backend/README.md for required variables)

-**Poller** (`cmd/poller`): long-running daemon that polls Ethereum via JSON-RPC,
-compares observed transactions against persisted alert rules, fires alert events
-to the database, and dispatches Discord notifications.
-
-**Frontend** (`frontend/`): React 19 SPA built with Vite. Authenticates with
-Firebase, communicates with the API via fetch, and renders the address/alert
-management UI.
-
-## Setting Up Your Alert Platforms
-
-Koin Ping can send real-time alerts to **Telegram**, **Discord**, **Slack**, and **Email**. Each channel is configured per-user through the **Notification Settings** panel on the Alerts page.
-
-Below are step-by-step guides for setting up each platform.
-
---
-
-### Telegram
-
-To receive alerts via Telegram, you need to create a bot and get your chat ID.
-
-#### 1. Create a Telegram Bot
-
-1. Open Telegram and search for **@BotFather** (look for the blue verified checkmark).
-2. Open the conversation with BotFather and send: `/newbot`
-3. BotFather will ask for a **display name** — enter something like `Koin Ping Alerts`.
-4. BotFather will ask for a **username** — it must end in `bot`, e.g. `MyKoinPingBot`.
-5. BotFather will reply with your **Bot Token** — a string that looks like `123456789:ABCdefGHIjklMNOpqrSTUvwxYZ`. Copy it.
-
-#### 2. Get Your Chat ID
-
-1. In Telegram, search for the bot username you just created and open the chat.
-2. Tap **Start** or send any message (e.g. `hello`).
-3. Open the following URL in your browser, replacing `YOUR_BOT_TOKEN` with the token from step 1:
-
-   ```
-   https://api.telegram.org/botYOUR_BOT_TOKEN/getUpdates
+4. Start the development server:
+   ```bash
+   npm run dev
   ```

-4. In the JSON response, find the `"chat"` object — the `"id"` field is your **Chat ID** (a numeric value).
+The backend will run on `http://localhost:3001`

-   > **Tip:** If the `"result"` array is empty, make sure you sent a message to your bot first, then refresh the page.
+### Frontend Setup

-#### 3. Save in Koin Ping
+1. Navigate to the frontend directory:
+   ```bash
+   cd frontend
+   ```

-1. Go to the **Alerts** page in Koin Ping.
-2. In the **Notification Settings** panel, find the **Telegram** section.
-3. Paste your **Bot Token** and **Chat ID** into the corresponding fields.
-4. Click **Save Settings**.
-5. Click **Test All Channels** to verify — you should receive a test message from your bot in Telegram.
+2. Install dependencies (already done):
+   ```bash
+   npm install
+   ```

---
+3. Start the development server:
+   ```bash
+   npm run dev
+   ```

-*Guides for Discord, Slack, and Email coming soon.*
-
-## License
-
-MIT. See [LICENSE](LICENSE).
-
-## Author
-
-Steven Jannette
+The frontend will run on `http://localhost:3000`
--- a/REPO_POLICIES.md
+++ b/REPO_POLICIES.md
@@ -1,188 +0,0 @@
---
-title: Repository Policies
-last_modified: 2026-02-22
---
-
-This document covers repository structure, tooling, and workflow standards. Code
-style conventions are in separate documents:
-
- [Code Styleguide](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/CODE_STYLEGUIDE.md)
-  (general, bash, Docker)
- [Go](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/CODE_STYLEGUIDE_GO.md)
- [JavaScript](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/CODE_STYLEGUIDE_JS.md)
- [Python](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/CODE_STYLEGUIDE_PYTHON.md)
- [Go HTTP Server Conventions](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/GO_HTTP_SERVER_CONVENTIONS.md)
-
---
-
- Cross-project documentation (such as this file) must include
-  `last_modified: YYYY-MM-DD` in the YAML front matter so it can be kept in sync
-  with the authoritative source as policies evolve.
-
- **ALL external references must be pinned by cryptographic hash.** This
-  includes Docker base images, Go modules, npm packages, GitHub Actions, and
-  anything else fetched from a remote source. Version tags (`@v4`, `@latest`,
-  `:3.21`, etc.) are server-mutable and therefore remote code execution
-  vulnerabilities. The ONLY acceptable way to reference an external dependency
-  is by its content hash (Docker `@sha256:...`, Go module hash in `go.sum`, npm
-  integrity hash in lockfile, GitHub Actions `@<commit-sha>`). No exceptions.
-  This also means never `curl | bash` to install tools like pyenv, nvm, rustup,
-  etc. Instead, download a specific release archive from GitHub, verify its hash
-  (hardcoded in the Dockerfile or script), and only then install. Unverified
-  install scripts are arbitrary remote code execution. This is the single most
-  important rule in this document. Double-check every external reference in
-  every file before committing. There are zero exceptions to this rule.
-
- Every repo with software must have a root `Makefile` with these targets:
-  `make test`, `make lint`, `make fmt` (writes), `make fmt-check` (read-only),
-  `make check` (prereqs: `test`, `lint`, `fmt-check`), `make docker`, and
-  `make hooks` (installs pre-commit hook). A model Makefile is at
-  `https://git.eeqj.de/sneak/prompts/raw/branch/main/Makefile`.
-
- Always use Makefile targets (`make fmt`, `make test`, `make lint`, etc.)
-  instead of invoking the underlying tools directly. The Makefile is the single
-  source of truth for how these operations are run.
-
- The Makefile is authoritative documentation for how the repo is used. Beyond
-  the required targets above, it should have targets for every common operation:
-  running a local development server (`make run`, `make dev`), re-initializing
-  or migrating the database (`make db-reset`, `make migrate`), building
-  artifacts (`make build`), generating code, seeding data, or anything else a
-  developer would do regularly. If someone checks out the repo and types
-  `make<tab>`, they should see every meaningful operation available. A new
-  contributor should be able to understand the entire development workflow by
-  reading the Makefile.
-
- Every repo should have a `Dockerfile`. All Dockerfiles must run `make check`
-  as a build step so the build fails if the branch is not green. For non-server
-  repos, the Dockerfile should bring up a development environment and run
-  `make check`. For server repos, `make check` should run as an early build
-  stage before the final image is assembled.
-
- Every repo should have a Gitea Actions workflow (`.gitea/workflows/`) that
-  runs `docker build .` on push. Since the Dockerfile already runs `make check`,
-  a successful build implies all checks pass.
-
- Use platform-standard formatters: `black` for Python, `prettier` for
-  JS/CSS/Markdown/HTML, `go fmt` for Go. Always use default configuration with
-  two exceptions: four-space indents (except Go), and `proseWrap: always` for
-  Markdown (hard-wrap at 80 columns). Documentation and writing repos (Markdown,
-  HTML, CSS) should also have `.prettierrc` and `.prettierignore`.
-
- Pre-commit hook: `make check` if local testing is possible, otherwise
-  `make lint && make fmt-check`. The Makefile should provide a `make hooks`
-  target to install the pre-commit hook.
-
- All repos with software must have tests that run via the platform-standard
-  test framework (`go test`, `pytest`, `jest`/`vitest`, etc.). If no meaningful
-  tests exist yet, add the most minimal test possible — e.g. importing the
-  module under test to verify it compiles/parses. There is no excuse for
-  `make test` to be a no-op.
-
- `make test` must complete in under 20 seconds. Add a 30-second timeout in the
-  Makefile.
-
- Docker builds must complete in under 5 minutes.
-
- `make check` must not modify any files in the repo. Tests may use temporary
-  directories.
-
- `main` must always pass `make check`, no exceptions.
-
- Never commit secrets. `.env` files, credentials, API keys, and private keys
-  must be in `.gitignore`. No exceptions.
-
- `.gitignore` should be comprehensive from the start: OS files (`.DS_Store`),
-  editor files (`.swp`, `*~`), language build artifacts, and `node_modules/`.
-  Fetch the standard `.gitignore` from
-  `https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitignore` when setting up
-  a new repo.
-
- Never use `git add -A` or `git add .`. Always stage files explicitly by name.
-
- Never force-push to `main`.
-
- Make all changes on a feature branch. You can do whatever you want on a
-  feature branch.
-
- `.golangci.yml` is standardized and must _NEVER_ be modified by an agent, only
-  manually by the user. Fetch from
-  `https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml`.
-
- When pinning images or packages by hash, add a comment above the reference
-  with the version and date (YYYY-MM-DD).
-
- Use `yarn`, not `npm`.
-
- Write all dates as YYYY-MM-DD (ISO 8601).
-
- Simple projects should be configured with environment variables.
-
- Dockerized web services listen on port 8080 by default, overridable with
-  `PORT`.
-
- `README.md` is the primary documentation. Required sections:
-    - **Description**: First line must include the project name, purpose,
-      category (web server, SPA, CLI tool, etc.), license, and author. Example:
-      "µPaaS is an MIT-licensed Go web application by @sneak that receives
-      git-frontend webhooks and deploys applications via Docker in realtime."
-    - **Getting Started**: Copy-pasteable install/usage code block.
-    - **Rationale**: Why does this exist?
-    - **Design**: How is the program structured?
-    - **TODO**: Update meticulously, even between commits. When planning, put
-      the todo list in the README so a new agent can pick up where the last one
-      left off.
-    - **License**: MIT, GPL, or WTFPL. Ask the user for new projects. Include a
-      `LICENSE` file in the repo root and a License section in the README.
-    - **Author**: [@sneak](https://sneak.berlin).
-
- First commit of a new repo should contain only `README.md`.
-
- Go module root: `sneak.berlin/go/<name>`. Always run `go mod tidy` before
-  committing.
-
- Use SemVer.
-
- Database migrations live in `internal/db/migrations/` and must be embedded in
-  the binary.
-    - `000_migration.sql` — contains ONLY the creation of the migrations
-      tracking table itself. Nothing else.
-    - `001_schema.sql` — the full application schema.
-    - **Pre-1.0.0:** never add additional migration files (002, 003, etc.).
-      There is no installed base to migrate. Edit `001_schema.sql` directly.
-    - **Post-1.0.0:** add new numbered migration files for each schema change.
-      Never edit existing migrations after release.
-
- All repos should have an `.editorconfig` enforcing the project's indentation
-  settings.
-
- Avoid putting files in the repo root unless necessary. Root should contain
-  only project-level config files (`README.md`, `Makefile`, `Dockerfile`,
-  `LICENSE`, `.gitignore`, `.editorconfig`, `REPO_POLICIES.md`, and
-  language-specific config). Everything else goes in a subdirectory. Canonical
-  subdirectory names:
-    - `bin/` — executable scripts and tools
-    - `cmd/` — Go command entrypoints
-    - `configs/` — configuration templates and examples
-    - `deploy/` — deployment manifests (k8s, compose, terraform)
-    - `docs/` — documentation and markdown (README.md stays in root)
-    - `internal/` — Go internal packages
-    - `internal/db/migrations/` — database migrations
-    - `pkg/` — Go library packages
-    - `share/` — systemd units, data files
-    - `static/` — static assets (images, fonts, etc.)
-    - `web/` — web frontend source
-
- When setting up a new repo, files from the `prompts` repo may be used as
-  templates. Fetch them from
-  `https://git.eeqj.de/sneak/prompts/raw/branch/main/<path>`.
-
- New repos must contain at minimum:
-    - `README.md`, `.git`, `.gitignore`, `.editorconfig`
-    - `LICENSE`, `REPO_POLICIES.md` (copy from the `prompts` repo)
-    - `Makefile`
-    - `Dockerfile`, `.dockerignore`
-    - `.gitea/workflows/check.yml`
-    - Go: `go.mod`, `go.sum`, `.golangci.yml`
-    - JS: `package.json`, `yarn.lock`, `.prettierrc`, `.prettierignore`
-    - Python: `pyproject.toml`
--- a/backend-go/.env.example
+++ b/backend-go/.env.example
@@ -14,7 +14,3 @@ POLL_INTERVAL_MS=60000

 # Firebase
 FIREBASE_PROJECT_ID=koin-ping
-
-# Email notifications (Resend — https://resend.com)
-# RESEND_API_KEY=re_xxxxxxxxxxxx
-# EMAIL_FROM=Koin Ping <alerts@yourdomain.com>
--- a/backend-go/.golangci.yml
+++ b/backend-go/.golangci.yml
@@ -1,32 +0,0 @@
-version: "2"
-
-run:
-  timeout: 5m
-  modules-download-mode: readonly
-
-linters:
-  default: all
-  disable:
-    # Genuinely incompatible with project patterns
-    - exhaustruct      # Requires all struct fields
-    - depguard         # Dependency allow/block lists
-    - godot            # Requires comments to end with periods
-    - wsl              # Deprecated, replaced by wsl_v5
-    - wrapcheck        # Too verbose for internal packages
-    - varnamelen       # Short names like db, id are idiomatic Go
-
-linters-settings:
-  lll:
-    line-length: 88
-  funlen:
-    lines: 80
-    statements: 50
-  cyclop:
-    max-complexity: 15
-  dupl:
-    threshold: 100
-
-issues:
-  exclude-use-default: false
-  max-issues-per-linter: 0
-  max-same-issues: 0
--- a/backend-go/ENV_TEMPLATE.md
+++ b/backend-go/ENV_TEMPLATE.md
@@ -37,20 +37,16 @@ cp ENV_TEMPLATE.md .env

 ## Firebase Setup

-For Firebase Admin SDK to work, you need to set up Application Default
-Credentials:
+For Firebase Admin SDK to work, you need to set up Application Default Credentials:

 **Option 1: Use Firebase Project ID (easiest for development)**
-
 - Just set `FIREBASE_PROJECT_ID` in .env
 - Firebase Admin will use Application Default Credentials

 **Option 2: Use Service Account Key (production)**
-
 1. Go to Firebase Console > Project Settings > Service Accounts
 2. Click "Generate new private key"
 3. Download the JSON file
 4. Either:
-    - Set `GOOGLE_APPLICATION_CREDENTIALS=/path/to/serviceAccountKey.json` in
-      .env
+   - Set `GOOGLE_APPLICATION_CREDENTIALS=/path/to/serviceAccountKey.json` in .env
   - Or keep it in backend/ and add to .gitignore
--- a/backend-go/README.md
+++ b/backend-go/README.md
@@ -1,15 +1,4 @@
-Start DB:
+Run Backend:

-brew services start postgresql@15
-
-
-From the backend-go directory, you have a few options:
-
-Option 1: Single command (both API + poller)
-cd /Users/kjannette/workspace/koin_ping_0.2.0/backend-gomake dev-all
-
-Option 2: Two separate terminals
-Terminal 1 (API server):
-cd /Users/kjannette/workspace/koin_ping_0.2.0/backend-gogo run ./cmd/api
-Terminal 2 (Poller):
-cd /Users/kjannette/workspace/koin_ping_0.2.0/backend-gogo run ./cmd/poller
+cd /Users/kjannette/workspace/koin_ping/backend-go
+go run ./cmd/api
--- a/backend-go/api
+++ b/backend-go/api
--- a/backend-go/cmd/api/main.go
+++ b/backend-go/cmd/api/main.go
@@ -1,11 +1,10 @@
-// Package main is the entry point for the API server.
 package main

 import (
 	"fmt"
 	"log"
 	"net/http"
-	"time"
+	"os"

 	"github.com/joho/godotenv"
 	"github.com/kjannette/koin-ping/backend-go/internal/config"
@@ -14,19 +13,11 @@ import (
 	"github.com/kjannette/koin-ping/backend-go/internal/handlers"
 	"github.com/kjannette/koin-ping/backend-go/internal/middleware"
 	"github.com/kjannette/koin-ping/backend-go/internal/models"
-	"github.com/kjannette/koin-ping/backend-go/internal/services"
+	"github.com/kjannette/koin-ping/backend-go/internal/protocols/ethereum"
 )

-const (
-	// max duration to read a request.
-	serverReadTimeoutSeconds = 5
-	// maxiduration to write a response.
-	serverWriteTimeoutSeconds = 10
-)
-
-//nolint:funlen
 func main() {
-	_ = godotenv.Load() // .env is optional; env vars can also be set externally
+	_ = godotenv.Load()

 	cfg, err := config.Load()
 	if err != nil {
@@ -37,76 +28,53 @@ func main() {
 	if err != nil {
 		log.Fatalf("Failed to connect to database: %v", err)
 	}
+	defer database.Close()

 	if err := firebase.Init(cfg.FirebaseProjectID); err != nil {
 		log.Fatalf("Failed to initialize Firebase: %v", err)
 	}

-	defer database.Close()
+	var eth ethereum.EthereumObserver
+	if cfg.EthRPCURL != "" {
+		eth, err = ethereum.NewJsonRpcEthereum(cfg.EthRPCURL)
+		if err != nil {
+			log.Printf("Warning: Failed to create Ethereum observer: %v", err)
+		}
+	}

 	addressModel := models.NewAddressModel(pool)
 	alertRuleModel := models.NewAlertRuleModel(pool)
 	alertEventModel := models.NewAlertEventModel(pool)
-	checkpointModel := models.NewCheckpointModel(pool)
 	notifConfigModel := models.NewNotificationConfigModel(pool)
-
-	emailDigestSvc := services.NewEmailDigestService(
-		cfg.ResendAPIKey, cfg.EmailFrom, alertEventModel, notifConfigModel,
-	)
+	checkpointModel := models.NewCheckpointModel(pool)

 	addressHandler := handlers.NewAddressHandler(addressModel)
 	alertRuleHandler := handlers.NewAlertRuleHandler(alertRuleModel, addressModel)
 	alertEventHandler := handlers.NewAlertEventHandler(alertEventModel)
-	notifConfigHandler := handlers.NewNotificationConfigHandler(notifConfigModel, cfg)
-	emailDigestHandler := handlers.NewEmailDigestHandler(emailDigestSvc, notifConfigModel)
-	statusHandler := handlers.NewStatusHandler(checkpointModel)
+	notifConfigHandler := handlers.NewNotificationConfigHandler(notifConfigModel)
+	statusHandler := handlers.NewStatusHandler(eth, checkpointModel)

 	mux := http.NewServeMux()
-	b := cfg.APIBasePath // e.g. "/v1"
+	b := cfg.APIBasePath

-	// Public routes
 	mux.HandleFunc("GET "+b+"/health", handlers.HealthCheck)
-	mux.HandleFunc("GET "+b+"/status", statusHandler.GetStatus)
+	mux.HandleFunc("GET "+b+"/status", statusHandler.SystemStatus)

-	// Authenticated routes — addresses
-	mux.Handle("POST "+b+"/addresses",
-		middleware.Authenticate(http.HandlerFunc(addressHandler.Create)))
-	mux.Handle("GET "+b+"/addresses",
-		middleware.Authenticate(http.HandlerFunc(addressHandler.List)))
-	mux.Handle("DELETE "+b+"/addresses/{addressId}",
-		middleware.Authenticate(http.HandlerFunc(addressHandler.Remove)))
-	mux.Handle("PATCH "+b+"/addresses/{addressId}",
-		middleware.Authenticate(http.HandlerFunc(addressHandler.UpdateLabel)))
+	mux.Handle("POST "+b+"/addresses", middleware.Authenticate(http.HandlerFunc(addressHandler.Create)))
+	mux.Handle("GET "+b+"/addresses", middleware.Authenticate(http.HandlerFunc(addressHandler.List)))
+	mux.Handle("DELETE "+b+"/addresses/{addressId}", middleware.Authenticate(http.HandlerFunc(addressHandler.Remove)))

-	// Authenticated routes for alert rules
-	mux.Handle("POST "+b+"/addresses/{addressId}/alerts",
-		middleware.Authenticate(http.HandlerFunc(alertRuleHandler.Create)))
-	mux.Handle("GET "+b+"/addresses/{addressId}/alerts",
-		middleware.Authenticate(http.HandlerFunc(alertRuleHandler.ListByAddress)))
-	mux.Handle("PATCH "+b+"/alerts/{alertId}",
-		middleware.Authenticate(http.HandlerFunc(alertRuleHandler.UpdateStatus)))
-	mux.Handle("DELETE "+b+"/alerts/{alertId}",
-		middleware.Authenticate(http.HandlerFunc(alertRuleHandler.Remove)))
+	mux.Handle("POST "+b+"/addresses/{addressId}/alerts", middleware.Authenticate(http.HandlerFunc(alertRuleHandler.Create)))
+	mux.Handle("GET "+b+"/addresses/{addressId}/alerts", middleware.Authenticate(http.HandlerFunc(alertRuleHandler.ListByAddress)))
+	mux.Handle("PATCH "+b+"/alerts/{alertId}", middleware.Authenticate(http.HandlerFunc(alertRuleHandler.UpdateStatus)))
+	mux.Handle("DELETE "+b+"/alerts/{alertId}", middleware.Authenticate(http.HandlerFunc(alertRuleHandler.Remove)))

-	// Authenticated routes — alert events
-	mux.Handle("GET "+b+"/alert-events",
-		middleware.Authenticate(http.HandlerFunc(alertEventHandler.List)))
+	mux.Handle("GET "+b+"/alert-events", middleware.Authenticate(http.HandlerFunc(alertEventHandler.List)))

-	// Authenticated routes — notification config
-	mux.Handle("GET "+b+"/notification-config",
-		middleware.Authenticate(http.HandlerFunc(notifConfigHandler.GetConfig)))
-	mux.Handle("PUT "+b+"/notification-config",
-		middleware.Authenticate(http.HandlerFunc(notifConfigHandler.UpdateConfig)))
-	mux.Handle("DELETE "+b+"/notification-config",
-		middleware.Authenticate(http.HandlerFunc(notifConfigHandler.DeleteConfig)))
-	mux.Handle("POST "+b+"/notification-config/test",
-		middleware.Authenticate(http.HandlerFunc(notifConfigHandler.TestChannels)))
-
-	// Authenticated routes — email digest
-	mux.Handle("POST "+b+"/email/setup",
-		middleware.Authenticate(http.HandlerFunc(emailDigestHandler.SetupEmail)))
-	mux.Handle("POST "+b+"/email/digest",
-		middleware.Authenticate(http.HandlerFunc(emailDigestHandler.SendDigest)))
+	mux.Handle("GET "+b+"/notification-config", middleware.Authenticate(http.HandlerFunc(notifConfigHandler.GetConfig)))
+	mux.Handle("PUT "+b+"/notification-config", middleware.Authenticate(http.HandlerFunc(notifConfigHandler.UpdateConfig)))
+	mux.Handle("DELETE "+b+"/notification-config", middleware.Authenticate(http.HandlerFunc(notifConfigHandler.DeleteConfig)))
+	mux.Handle("POST "+b+"/notification-config/test", middleware.Authenticate(http.HandlerFunc(notifConfigHandler.TestWebhook)))

 	handler := corsMiddleware(mux)

@@ -115,14 +83,9 @@ func main() {
 	log.Printf("API base path: %s", cfg.APIBasePath)
 	log.Printf("Environment: %s", cfg.NodeEnv)

-	server := &http.Server{
-		Addr:         addr,
-		Handler:      handler,
-		ReadTimeout:  serverReadTimeoutSeconds * time.Second,
-		WriteTimeout: serverWriteTimeoutSeconds * time.Second,
-	}
-	if err := server.ListenAndServe(); err != nil {
+	if err := http.ListenAndServe(addr, handler); err != nil {
 		log.Fatalf("Server failed: %v", err)
+		os.Exit(1)
 	}
 }

@@ -134,7 +97,6 @@ func corsMiddleware(next http.Handler) http.Handler {

 		if r.Method == http.MethodOptions {
 			w.WriteHeader(http.StatusNoContent)
-
 			return
 		}

--- a/backend-go/cmd/poller/main.go
+++ b/backend-go/cmd/poller/main.go
@@ -1,4 +1,3 @@
-// Package main is the entry point for the blockchain observer poller.
 package main

 import (
@@ -15,18 +14,11 @@ import (
 	"github.com/kjannette/koin-ping/backend-go/internal/config"
 	"github.com/kjannette/koin-ping/backend-go/internal/database"
 	"github.com/kjannette/koin-ping/backend-go/internal/models"
+	"github.com/kjannette/koin-ping/backend-go/internal/notifications"
 	"github.com/kjannette/koin-ping/backend-go/internal/protocols/ethereum"
 	"github.com/kjannette/koin-ping/backend-go/internal/services"
 )

-const (
-	// separatorWidth is the number of characters in log separator lines.
-	separatorWidth = 60
-	// msPerSecond converts milliseconds to seconds.
-	msPerSecond = 1000
-)
-
-//nolint:funlen
 func main() {
 	_ = godotenv.Load()

@@ -43,26 +35,29 @@ func main() {
 	if err != nil {
 		log.Fatalf("Failed to connect to database: %v", err)
 	}
+	defer database.Close()

 	eth, err := ethereum.NewJsonRpcEthereum(cfg.EthRPCURL)
 	if err != nil {
 		log.Fatalf("Failed to create Ethereum observer: %v", err)
 	}

-	defer database.Close()
-
 	addressModel := models.NewAddressModel(pool)
 	alertRuleModel := models.NewAlertRuleModel(pool)
 	alertEventModel := models.NewAlertEventModel(pool)
 	checkpointModel := models.NewCheckpointModel(pool)
 	notifConfigModel := models.NewNotificationConfigModel(pool)

+	smtpCfg := notifications.SMTPConfig{
+		Host:     cfg.SMTPHost,
+		Port:     cfg.SMTPPort,
+		Username: cfg.SMTPUser,
+		Password: cfg.SMTPPassword,
+		From:     cfg.SMTPFrom,
+	}
+
 	observer := services.NewObserverService(eth, addressModel, checkpointModel)
-	evaluator := services.NewEvaluatorService(
-		eth, alertRuleModel, alertEventModel, addressModel, notifConfigModel,
-		cfg.ResendAPIKey, cfg.EmailFrom,
-	)
-	digestSvc := services.NewEmailDigestService(cfg.ResendAPIKey, cfg.EmailFrom, alertEventModel, notifConfigModel)
+	evaluator := services.NewEvaluatorService(eth, alertRuleModel, alertEventModel, addressModel, notifConfigModel, smtpCfg)

 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -72,69 +67,50 @@ func main() {
 	go func() {
 		<-sigCh
 		log.Println()
-		log.Println(strings.Repeat("=", separatorWidth))
+		log.Println(strings.Repeat("=", 60))
 		log.Println("Shutting down poller gracefully...")
-		log.Println(strings.Repeat("=", separatorWidth))
+		log.Println(strings.Repeat("=", 60))
 		cancel()
 	}()

 	interval := time.Duration(cfg.PollIntervalMS) * time.Millisecond
-	digestInterval := time.Duration(cfg.DigestIntervalHours) * time.Hour

-	log.Println(strings.Repeat("=", separatorWidth))
+	log.Println(strings.Repeat("=", 60))
 	log.Println("Koin Ping Observer Poller Starting")
-	log.Println(strings.Repeat("=", separatorWidth))
+	log.Println(strings.Repeat("=", 60))
 	log.Printf("RPC URL: %s", cfg.EthRPCURL)
-	log.Printf("Poll Interval: %dms (%ds)", cfg.PollIntervalMS, cfg.PollIntervalMS/msPerSecond)
-	log.Printf("Digest Interval: %dh", cfg.DigestIntervalHours)
-	log.Println(strings.Repeat("=", separatorWidth))
+	log.Printf("Poll Interval: %dms (%ds)", cfg.PollIntervalMS, cfg.PollIntervalMS/1000)
+	log.Println(strings.Repeat("=", 60))

 	runCycle(ctx, observer, evaluator)

 	ticker := time.NewTicker(interval)
 	defer ticker.Stop()

-	digestTicker := time.NewTicker(digestInterval)
-	defer digestTicker.Stop()
-
 	for {
 		select {
 		case <-ctx.Done():
 			log.Println("Poller stopped")
-
 			return
 		case <-ticker.C:
 			runCycle(ctx, observer, evaluator)
-		case <-digestTicker.C:
-			sent, digestErr := digestSvc.SendDigestsForAllUsers(ctx)
-			if digestErr != nil {
-				log.Printf("Email digest failed: %v", digestErr)
-			} else {
-				log.Printf("Sent %d email digests", sent)
-			}
 		}
 	}
 }

-func runCycle(
-	ctx context.Context,
-	observer *services.ObserverService,
-	evaluator *services.EvaluatorService,
-) {
+func runCycle(ctx context.Context, observer *services.ObserverService, evaluator *services.EvaluatorService) {
 	startTime := time.Now()
 	log.Printf("[%s] Starting observation cycle...", time.Now().UTC().Format(time.RFC3339))

 	observations, err := observer.RunOnce(ctx)
 	if err != nil {
 		log.Printf("[%s] Observation cycle failed: %v", time.Now().UTC().Format(time.RFC3339), err)
-
 		return
 	}

 	alertsFired, err := evaluator.Evaluate(ctx, observations)
 	if err != nil {
 		log.Printf("[%s] Evaluation failed: %v", time.Now().UTC().Format(time.RFC3339), err)
-
 		return
 	}

--- a/backend-go/go.mod
+++ b/backend-go/go.mod
@@ -42,7 +42,6 @@ require (
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
-	github.com/resend/resend-go/v3 v3.1.1 // indirect
 	github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
--- a/backend-go/go.sum
+++ b/backend-go/go.sum
@@ -92,8 +92,6 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/resend/resend-go/v3 v3.1.1 h1:Uwpf/tZU+O/r/3nMWE6zUAMIG9dX/vTBS3wlQzYJKSw=
-github.com/resend/resend-go/v3 v3.1.1/go.mod h1:iI7VA0NoGjWvsNii5iNC5Dy0llsI3HncXPejhniYzwE=
 github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
 github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
--- a/backend-go/infra/migrations/003_replace_telegram_with_slack.sql
+++ b/backend-go/infra/migrations/003_replace_telegram_with_slack.sql
@@ -1,2 +1,4 @@
 ALTER TABLE user_notification_configs
+  DROP COLUMN IF EXISTS telegram_chat_id,
+  DROP COLUMN IF EXISTS telegram_bot_token,
  ADD COLUMN IF NOT EXISTS slack_webhook_url TEXT;
--- a/backend-go/infra/migrations/004_alert_event_dedup.sql
+++ b/backend-go/infra/migrations/004_alert_event_dedup.sql
@@ -1,3 +0,0 @@
-CREATE UNIQUE INDEX IF NOT EXISTS idx_alert_events_dedup
-    ON alert_events (alert_rule_id, tx_hash)
-    WHERE tx_hash IS NOT NULL;
--- a/backend-go/infra/schema.sql
+++ b/backend-go/infra/schema.sql
@@ -53,10 +53,8 @@ CREATE TABLE address_checkpoints (
 CREATE TABLE user_notification_configs (
  user_id VARCHAR(128) PRIMARY KEY,
  discord_webhook_url TEXT,            -- Discord webhook URL (nullable)
-  telegram_chat_id VARCHAR(128),       -- Telegram chat ID (nullable)
-  telegram_bot_token VARCHAR(255),     -- Telegram bot token (nullable)
-  email VARCHAR(255),                  -- Email for notifications (nullable)
  slack_webhook_url TEXT,              -- Slack incoming webhook URL (nullable)
+  email VARCHAR(255),                  -- Email for notifications (nullable)
  notification_enabled BOOLEAN DEFAULT TRUE,  -- Master on/off switch
  created_at TIMESTAMP DEFAULT NOW(),
  updated_at TIMESTAMP DEFAULT NOW()
--- a/backend-go/internal/config/config.go
+++ b/backend-go/internal/config/config.go
@@ -1,4 +1,3 @@
-//loads environment-based configuration.
 package config

 import (
@@ -8,14 +7,6 @@ import (
 	"strings"
 )

-const (
-	defaultPort = 3001
-	defaultDBPort = 5432
-	defaultPollIntervalMS = 60000
-	minPollIntervalMS = 1000
-	defaultDigestIntervalHours = 24
-)
-
 type Config struct {
 	Port              int
 	APIBasePath       string
@@ -29,33 +20,38 @@ type Config struct {
 	EthRPCURL         string
 	PollIntervalMS    int
 	NodeEnv           string
-	ResendAPIKey         string
-	EmailFrom            string
-	DigestIntervalHours  int
+
+	SMTPHost     string
+	SMTPPort     int
+	SMTPUser     string
+	SMTPPassword string
+	SMTPFrom     string
 }

-// Load reads configuration from environment variables and returns a Config.
 func Load() (*Config, error) {
 	cfg := &Config{
-		Port:              getEnvInt("PORT", defaultPort),
+		Port:           getEnvInt("PORT", 3001),
 		APIBasePath:    getEnv("API_BASE_PATH", "/v1"),
 		DatabaseURL:    os.Getenv("DATABASE_URL"),
 		DBHost:         getEnv("DB_HOST", "localhost"),
-		DBPort:            getEnvInt("DB_PORT", defaultDBPort),
+		DBPort:         getEnvInt("DB_PORT", 5432),
 		DBUser:         os.Getenv("DB_USER"),
 		DBPassword:     os.Getenv("DB_PASSWORD"),
 		DBName:         os.Getenv("DB_NAME"),
 		FirebaseProjectID: os.Getenv("FIREBASE_PROJECT_ID"),
 		EthRPCURL:      os.Getenv("ETH_RPC_URL"),
-		PollIntervalMS:    getEnvInt("POLL_INTERVAL_MS", defaultPollIntervalMS),
+		PollIntervalMS: getEnvInt("POLL_INTERVAL_MS", 60000),
 		NodeEnv:        getEnv("NODE_ENV", "development"),
-		ResendAPIKey:        os.Getenv("RESEND_API_KEY"),
-		EmailFrom:           getEnv("EMAIL_FROM", "Koin Ping <alerts@koinping.com>"),
-		DigestIntervalHours: getEnvInt("DIGEST_INTERVAL_HOURS", defaultDigestIntervalHours),
+
+		SMTPHost:     os.Getenv("SMTP_HOST"),
+		SMTPPort:     getEnvInt("SMTP_PORT", 587),
+		SMTPUser:     os.Getenv("SMTP_USER"),
+		SMTPPassword: os.Getenv("SMTP_PASSWORD"),
+		SMTPFrom:     os.Getenv("SMTP_FROM"),
 	}

-	if cfg.PollIntervalMS < minPollIntervalMS {
-		return nil, fmt.Errorf("POLL_INTERVAL_MS must be >= 1000, got %d", cfg.PollIntervalMS) //nolint:err113
+	if cfg.PollIntervalMS < 1000 {
+		return nil, fmt.Errorf("POLL_INTERVAL_MS must be >= 1000, got %d", cfg.PollIntervalMS)
 	}

 	return cfg, nil
@@ -63,19 +59,17 @@ func Load() (*Config, error) {

 func (c *Config) DSN() string {
 	if c.DatabaseURL != "" {
+		// pgx defaults to sslmode=prefer, which fails against local Postgres.
 		// Append sslmode=disable if not already specified.
 		if !strings.Contains(c.DatabaseURL, "sslmode=") {
 			sep := "?"
 			if strings.Contains(c.DatabaseURL, "?") {
 				sep = "&"
 			}
-
 			return c.DatabaseURL + sep + "sslmode=disable"
 		}
-
 		return c.DatabaseURL
 	}
-
 	return fmt.Sprintf(
 		"host=%s port=%d user=%s password=%s dbname=%s sslmode=disable",
 		c.DBHost, c.DBPort, c.DBUser, c.DBPassword, c.DBName,
@@ -86,7 +80,6 @@ func getEnv(key, fallback string) string {
 	if v := os.Getenv(key); v != "" {
 		return v
 	}
-
 	return fallback
 }

@@ -96,6 +89,5 @@ func getEnvInt(key string, fallback int) int {
 			return n
 		}
 	}
-
 	return fallback
 }
--- a/backend-go/internal/config/config_test.go
+++ b/backend-go/internal/config/config_test.go
@@ -0,0 +1,115 @@
+package config
+
+import (
+	"os"
+	"strings"
+	"testing"
+)
+
+func TestLoad_Defaults(t *testing.T) {
+	for _, key := range []string{"PORT", "API_BASE_PATH", "POLL_INTERVAL_MS", "NODE_ENV", "SMTP_PORT"} {
+		os.Unsetenv(key)
+	}
+
+	cfg, err := Load()
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	if cfg.Port != 3001 {
+		t.Errorf("Port = %d, want 3001", cfg.Port)
+	}
+	if cfg.APIBasePath != "/v1" {
+		t.Errorf("APIBasePath = %q, want /v1", cfg.APIBasePath)
+	}
+	if cfg.PollIntervalMS != 60000 {
+		t.Errorf("PollIntervalMS = %d, want 60000", cfg.PollIntervalMS)
+	}
+	if cfg.NodeEnv != "development" {
+		t.Errorf("NodeEnv = %q, want development", cfg.NodeEnv)
+	}
+	if cfg.SMTPPort != 587 {
+		t.Errorf("SMTPPort = %d, want 587", cfg.SMTPPort)
+	}
+}
+
+func TestLoad_InvalidPollInterval(t *testing.T) {
+	os.Setenv("POLL_INTERVAL_MS", "500")
+	defer os.Unsetenv("POLL_INTERVAL_MS")
+
+	_, err := Load()
+	if err == nil {
+		t.Fatal("expected error for poll interval < 1000")
+	}
+}
+
+func TestDSN_DatabaseURL(t *testing.T) {
+	cfg := &Config{DatabaseURL: "postgres://user:pass@localhost/db"}
+	dsn := cfg.DSN()
+	if !strings.Contains(dsn, "sslmode=disable") {
+		t.Error("DSN should append sslmode=disable")
+	}
+	if !strings.HasPrefix(dsn, "postgres://user:pass@localhost/db") {
+		t.Error("DSN should preserve original URL")
+	}
+}
+
+func TestDSN_DatabaseURL_WithSSLMode(t *testing.T) {
+	cfg := &Config{DatabaseURL: "postgres://user:pass@localhost/db?sslmode=require"}
+	dsn := cfg.DSN()
+	if strings.Count(dsn, "sslmode=") != 1 {
+		t.Error("DSN should not duplicate sslmode")
+	}
+}
+
+func TestDSN_Components(t *testing.T) {
+	cfg := &Config{
+		DBHost:     "myhost",
+		DBPort:     5433,
+		DBUser:     "myuser",
+		DBPassword: "mypass",
+		DBName:     "mydb",
+	}
+	dsn := cfg.DSN()
+	if !strings.Contains(dsn, "host=myhost") {
+		t.Error("DSN should contain host")
+	}
+	if !strings.Contains(dsn, "port=5433") {
+		t.Error("DSN should contain port")
+	}
+	if !strings.Contains(dsn, "user=myuser") {
+		t.Error("DSN should contain user")
+	}
+	if !strings.Contains(dsn, "dbname=mydb") {
+		t.Error("DSN should contain dbname")
+	}
+}
+
+func TestGetEnv(t *testing.T) {
+	os.Setenv("TEST_KEY_KOINPING", "value")
+	defer os.Unsetenv("TEST_KEY_KOINPING")
+
+	if got := getEnv("TEST_KEY_KOINPING", "fallback"); got != "value" {
+		t.Errorf("got %q, want %q", got, "value")
+	}
+	if got := getEnv("NONEXISTENT_KEY_KOINPING", "fallback"); got != "fallback" {
+		t.Errorf("got %q, want %q", got, "fallback")
+	}
+}
+
+func TestGetEnvInt(t *testing.T) {
+	os.Setenv("TEST_INT_KOINPING", "42")
+	defer os.Unsetenv("TEST_INT_KOINPING")
+
+	if got := getEnvInt("TEST_INT_KOINPING", 0); got != 42 {
+		t.Errorf("got %d, want 42", got)
+	}
+	if got := getEnvInt("NONEXISTENT_INT_KOINPING", 99); got != 99 {
+		t.Errorf("got %d, want 99", got)
+	}
+
+	os.Setenv("TEST_INT_KOINPING", "notanumber")
+	if got := getEnvInt("TEST_INT_KOINPING", 99); got != 99 {
+		t.Errorf("got %d, want 99 for invalid int", got)
+	}
+}
--- a/backend-go/internal/database/postgres.go
+++ b/backend-go/internal/database/postgres.go
@@ -9,34 +9,20 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"
 )

-const (
+var pool *pgxpool.Pool

-	maxConnIdleSeconds = 30
-
-	maxConnLifetimeMinutes = 5
-
-	connectTimeoutSeconds = 10
-
-	maxConns = 20
-
-	minConns = 2
-)
-
-var pool *pgxpool.Pool //nolint:gochecknoglobals
-
-// establishPostgreSQL connection pool using the given DSN.
 func Connect(dsn string) (*pgxpool.Pool, error) {
 	cfg, err := pgxpool.ParseConfig(dsn)
 	if err != nil {
 		return nil, fmt.Errorf("parse database config: %w", err)
 	}

-	cfg.MaxConns = maxConns
-	cfg.MinConns = minConns
-	cfg.MaxConnIdleTime = maxConnIdleSeconds * time.Second
-	cfg.MaxConnLifetime = maxConnLifetimeMinutes * time.Minute
+	cfg.MaxConns = 20
+	cfg.MinConns = 2
+	cfg.MaxConnIdleTime = 30 * time.Second
+	cfg.MaxConnLifetime = 5 * time.Minute

-	ctx, cancel := context.WithTimeout(context.Background(), connectTimeoutSeconds*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()

 	p, err := pgxpool.NewWithConfig(ctx, cfg)
@@ -46,13 +32,11 @@ func Connect(dsn string) (*pgxpool.Pool, error) {

 	if err := p.Ping(ctx); err != nil {
 		p.Close()
-
 		return nil, fmt.Errorf("ping database: %w", err)
 	}

 	log.Println("Connected to PostgreSQL database")
 	pool = p
-
 	return p, nil
 }

--- a/backend-go/internal/domain/types.go
+++ b/backend-go/internal/domain/types.go
@@ -4,16 +4,14 @@ import "time"

 type Address struct {
 	ID        int       `json:"id"`
-	UserID    string    `json:"user_id"`    //nolint:tagliatelle
+	UserID    string    `json:"user_id"`
 	Address   string    `json:"address"`
 	Label     *string   `json:"label"`
-	CreatedAt time.Time `json:"created_at"` //nolint:tagliatelle
+	CreatedAt time.Time `json:"created_at"`
 }

 type AlertType string

-func (a AlertType) String() string { return string(a) }
-
 const (
 	AlertIncomingTx    AlertType = "incoming_tx"
 	AlertOutgoingTx    AlertType = "outgoing_tx"
@@ -21,113 +19,89 @@ const (
 	AlertBalanceBelow  AlertType = "balance_below"
 )

-var ValidAlertTypes = []AlertType{ //nolint:gochecknoglobals
+var ValidAlertTypes = []AlertType{
 	AlertIncomingTx,
 	AlertOutgoingTx,
 	AlertLargeTransfer,
 	AlertBalanceBelow,
 }

-// ThresholdRequiredTypes lists alert types that require a threshold value.
-var ThresholdRequiredTypes = []AlertType{ //nolint:gochecknoglobals
+var ThresholdRequiredTypes = []AlertType{
 	AlertLargeTransfer,
 	AlertBalanceBelow,
 }

-// IsValidAlertType returns true if the given string matches a known AlertType.
 func IsValidAlertType(t string) bool {
 	for _, v := range ValidAlertTypes {
 		if string(v) == t {
 			return true
 		}
 	}
-
 	return false
 }

-// IsThresholdRequired returns true if the given AlertType requires a threshold.
 func IsThresholdRequired(t AlertType) bool {
 	for _, v := range ThresholdRequiredTypes {
 		if v == t {
 			return true
 		}
 	}
-
 	return false
 }

 type AlertRule struct {
 	ID        int       `json:"id"`
-	AddressID int       `json:"address_id"` //nolint:tagliatelle
+	AddressID int       `json:"address_id"`
 	Type      AlertType `json:"type"`
 	Threshold *float64  `json:"threshold"`
 	Enabled   bool      `json:"enabled"`
-	CreatedAt time.Time `json:"created_at"` //nolint:tagliatelle
+	CreatedAt time.Time `json:"created_at"`
 }

 type AlertEvent struct {
 	ID          int       `json:"id"`
-	AlertRuleID  int       `json:"alert_rule_id"`   //nolint:tagliatelle
+	AlertRuleID int       `json:"alert_rule_id"`
 	Message     string    `json:"message"`
-	AddressLabel *string   `json:"address_label"`   //nolint:tagliatelle
-	TxHash       *string   `json:"tx_hash"`         //nolint:tagliatelle
+	AddressLabel *string  `json:"address_label"`
+	TxHash      *string   `json:"tx_hash"`
 	Timestamp   time.Time `json:"timestamp"`
 }

 type AddressCheckpoint struct {
-	AddressID        int       `json:"address_id"`         //nolint:tagliatelle
-	LastCheckedBlock int       `json:"last_checked_block"` //nolint:tagliatelle
-	LastCheckedAt    time.Time `json:"last_checked_at"`    //nolint:tagliatelle
+	AddressID        int       `json:"address_id"`
+	LastCheckedBlock int       `json:"last_checked_block"`
+	LastCheckedAt    time.Time `json:"last_checked_at"`
 }

-// CheckpointDetail combines checkpoint and address info for reporting.
 type CheckpointDetail struct {
-	AddressID        int       `json:"address_id"`         //nolint:tagliatelle
+	AddressID        int       `json:"address_id"`
 	Address          string    `json:"address"`
 	Label            *string   `json:"label"`
-	LastCheckedBlock int       `json:"last_checked_block"` //nolint:tagliatelle
-	LastCheckedAt    time.Time `json:"last_checked_at"`    //nolint:tagliatelle
+	LastCheckedBlock int       `json:"last_checked_block"`
+	LastCheckedAt    time.Time `json:"last_checked_at"`
 }

-// NotificationConfig holds a user's notification preferences.
 type NotificationConfig struct {
-	UserID              string     `json:"user_id"`              //nolint:tagliatelle
-	DiscordWebhookURL   *string    `json:"discord_webhook_url"`  //nolint:tagliatelle
-	TelegramChatID      *string    `json:"telegram_chat_id"`     //nolint:tagliatelle
-	TelegramBotToken    *string    `json:"telegram_bot_token"`   //nolint:tagliatelle
+	UserID              string     `json:"user_id"`
+	DiscordWebhookURL   *string    `json:"discord_webhook_url"`
+	SlackWebhookURL     *string    `json:"slack_webhook_url"`
 	Email               *string    `json:"email"`
-	SlackWebhookURL     *string    `json:"slack_webhook_url"`    //nolint:tagliatelle
-	NotificationEnabled bool       `json:"notification_enabled"` //nolint:tagliatelle
-	CreatedAt           *time.Time `json:"created_at,omitempty"` //nolint:tagliatelle
-	UpdatedAt           *time.Time `json:"updated_at,omitempty"` //nolint:tagliatelle
+	NotificationEnabled bool       `json:"notification_enabled"`
+	CreatedAt           *time.Time `json:"created_at,omitempty"`
+	UpdatedAt           *time.Time `json:"updated_at,omitempty"`
 }

-// NormalizedTx is a blockchain transaction normalized for internal use.
 type NormalizedTx struct {
 	Hash           string `json:"hash"`
 	From           string `json:"from"`
 	To             *string `json:"to"`
 	Value          string `json:"value"` // Wei as string for precision
-	BlockNumber    int     `json:"block_number"`    //nolint:tagliatelle
-	BlockTimestamp int64   `json:"block_timestamp"` //nolint:tagliatelle
-
-	// ERC-20 token transfer fields (nil for native ETH transfers)
-	TokenContract *string `json:"token_contract,omitempty"` //nolint:tagliatelle
-	TokenSymbol   *string `json:"token_symbol,omitempty"`   //nolint:tagliatelle
-	TokenDecimals *int    `json:"token_decimals,omitempty"` //nolint:tagliatelle
-	TokenValue    *string `json:"token_value,omitempty"`    //nolint:tagliatelle
-}
-
-// IsTokenTransfer returns true if this transaction represents an ERC-20 token transfer.
-func (tx NormalizedTx) IsTokenTransfer() bool {
-	return tx.TokenContract != nil
+	BlockNumber    int    `json:"block_number"`
+	BlockTimestamp int64  `json:"block_timestamp"`
 }

 type Direction string

-// String implements fmt.Stringer.
-func (d Direction) String() string { return string(d) }
-
 const (
 	DirectionIncoming Direction = "incoming"
 	DirectionOutgoing Direction = "outgoing"
@@ -135,6 +109,6 @@ const (

 type ObservedTx struct {
 	NormalizedTx
-	AddressID int       `json:"address_id"` //nolint:tagliatelle
+	AddressID int       `json:"address_id"`
 	Direction Direction `json:"direction"`
 }
--- a/backend-go/internal/domain/types_test.go
+++ b/backend-go/internal/domain/types_test.go
@@ -0,0 +1,35 @@
+package domain
+
+import "testing"
+
+func TestIsValidAlertType(t *testing.T) {
+	valid := []string{"incoming_tx", "outgoing_tx", "large_transfer", "balance_below"}
+	for _, v := range valid {
+		if !IsValidAlertType(v) {
+			t.Errorf("IsValidAlertType(%q) = false, want true", v)
+		}
+	}
+
+	invalid := []string{"", "invalid", "INCOMING_TX", "send", "receive"}
+	for _, v := range invalid {
+		if IsValidAlertType(v) {
+			t.Errorf("IsValidAlertType(%q) = true, want false", v)
+		}
+	}
+}
+
+func TestIsThresholdRequired(t *testing.T) {
+	required := []AlertType{AlertLargeTransfer, AlertBalanceBelow}
+	for _, at := range required {
+		if !IsThresholdRequired(at) {
+			t.Errorf("IsThresholdRequired(%q) = false, want true", at)
+		}
+	}
+
+	notRequired := []AlertType{AlertIncomingTx, AlertOutgoingTx}
+	for _, at := range notRequired {
+		if IsThresholdRequired(at) {
+			t.Errorf("IsThresholdRequired(%q) = true, want false", at)
+		}
+	}
+}
--- a/backend-go/internal/firebase/admin.go
+++ b/backend-go/internal/firebase/admin.go
@@ -10,10 +10,10 @@ import (
 	"google.golang.org/api/option"
 )

-var ( //nolint:gochecknoglobals
-	authClient *auth.Client //nolint:gochecknoglobals
-	once       sync.Once    //nolint:gochecknoglobals
-	errInit    error        //nolint:gochecknoglobals
+var (
+	authClient *auth.Client
+	once       sync.Once
+	initErr    error
 )

 func Init(projectID string) error {
@@ -30,20 +30,18 @@ func Init(projectID string) error {
 			app, err = fb.NewApp(ctx, nil)
 		}
 		if err != nil {
-			errInit = fmt.Errorf("initialize firebase app: %w", err)
-
+			initErr = fmt.Errorf("initialize firebase app: %w", err)
 			return
 		}

 		authClient, err = app.Auth(ctx)
 		if err != nil {
-			errInit = fmt.Errorf("initialize firebase auth: %w", err)
-
+			initErr = fmt.Errorf("initialize firebase auth: %w", err)
 			return
 		}
 	})

-	return errInit
+	return initErr
 }

 func Auth() *auth.Client {
--- a/backend-go/internal/handlers/address.go
+++ b/backend-go/internal/handlers/address.go
@@ -1,4 +1,3 @@
-// Package handlers implements HTTP request handlers for the API.
 package handlers

 import (
@@ -33,19 +32,16 @@ func (h *AddressHandler) Create(w http.ResponseWriter, r *http.Request) {
 	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
 		log.Printf("Failed to decode address request body: %v", err)
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid request body")
-
 		return
 	}

 	if body.Address == "" {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Address is required")
-
 		return
 	}

 	if !ethAddressRe.MatchString(body.Address) {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid Ethereum address format")
-
 		return
 	}

@@ -55,12 +51,10 @@ func (h *AddressHandler) Create(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		if strings.Contains(err.Error(), "23505") || strings.Contains(err.Error(), "unique") {
 			writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "You are already tracking this address")
-
 			return
 		}
 		log.Printf("Error creating address: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to create address")
-
 		return
 	}

@@ -68,7 +62,6 @@ func (h *AddressHandler) Create(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusCreated, addr)
 }

-// List handles GET requests to list all tracked addresses for the current user.
 func (h *AddressHandler) List(w http.ResponseWriter, r *http.Request) {
 	userID := middleware.GetUserID(r.Context())
 	log.Printf("User %s listing addresses", userID)
@@ -77,7 +70,6 @@ func (h *AddressHandler) List(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Printf("Error listing addresses: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to list addresses")
-
 		return
 	}

@@ -89,51 +81,11 @@ func (h *AddressHandler) List(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, addresses)
 }

-//  handles PATCH requests to update an address label.
-func (h *AddressHandler) UpdateLabel(w http.ResponseWriter, r *http.Request) {
-	userID := middleware.GetUserID(r.Context())
-	addressID, ok := parseIntParam(r.PathValue("addressId"))
-	if !ok {
-		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid address ID")
-
-		return
-	}
-
-	var body struct {
-		Label *string `json:"label"`
-	}
-	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
-		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid request body")
-
-		return
-	}
-
-	log.Printf("User %s updating label for address ID: %d", userID, addressID)
-
-	addr, err := h.addresses.UpdateLabel(r.Context(), addressID, userID, body.Label)
-	if err != nil {
-		log.Printf("Error updating address label: %v", err)
-		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to update address")
-
-		return
-	}
-
-	if addr == nil {
-		writeError(w, http.StatusNotFound, "NOT_FOUND", "Address not found")
-
-		return
-	}
-
-	writeJSON(w, http.StatusOK, addr)
-}
-
-// Remove handles DELETE requests to remove a tracked address.
 func (h *AddressHandler) Remove(w http.ResponseWriter, r *http.Request) {
 	userID := middleware.GetUserID(r.Context())
 	addressID, ok := parseIntParam(r.PathValue("addressId"))
 	if !ok {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid address ID")
-
 		return
 	}

@@ -143,14 +95,12 @@ func (h *AddressHandler) Remove(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Printf("Error deleting address: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to delete address")
-
 		return
 	}

 	if !deleted {
 		log.Printf("Address %d not found or not owned by user", addressID)
 		writeError(w, http.StatusNotFound, "NOT_FOUND", "Address not found")
-
 		return
 	}

--- a/backend-go/internal/handlers/alert_event.go
+++ b/backend-go/internal/handlers/alert_event.go
@@ -5,22 +5,18 @@ import (
 	"net/http"
 	"strconv"

-	"github.com/kjannette/koin-ping/backend-go/internal/domain"
 	"github.com/kjannette/koin-ping/backend-go/internal/middleware"
 	"github.com/kjannette/koin-ping/backend-go/internal/models"
 )

-// AlertEventHandler handles HTTP requests for alert event history.
 type AlertEventHandler struct {
 	alertEvents *models.AlertEventModel
 }

-// NewAlertEventHandler creates a new AlertEventHandler.
 func NewAlertEventHandler(alertEvents *models.AlertEventModel) *AlertEventHandler {
 	return &AlertEventHandler{alertEvents: alertEvents}
 }

-// List handles GET requests to list recent alert events for the current user.
 func (h *AlertEventHandler) List(w http.ResponseWriter, r *http.Request) {
 	userID := middleware.GetUserID(r.Context())

@@ -36,7 +32,6 @@ func (h *AlertEventHandler) List(w http.ResponseWriter, r *http.Request) {

 	if limit < 1 || limit > 100 {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Limit must be between 1 and 100")
-
 		return
 	}

@@ -44,15 +39,10 @@ func (h *AlertEventHandler) List(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Printf("Error listing alert events: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to list alert events")
-
 		return
 	}

 	log.Printf("Found %d alert events for user", len(events))

-	if events == nil {
-		events = []domain.AlertEvent{}
-	}
-
 	writeJSON(w, http.StatusOK, events)
 }
--- a/backend-go/internal/handlers/alert_rule.go
+++ b/backend-go/internal/handlers/alert_rule.go
@@ -2,7 +2,6 @@ package handlers

 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"log"
 	"net/http"
@@ -14,8 +13,6 @@ import (
 	"github.com/kjannette/koin-ping/backend-go/internal/models"
 )

-var errThresholdFormat = errors.New("unsupported threshold format")
-
 type AlertRuleHandler struct {
 	alertRules *models.AlertRuleModel
 	addresses  *models.AddressModel
@@ -30,7 +27,6 @@ func (h *AlertRuleHandler) Create(w http.ResponseWriter, r *http.Request) {
 	addressID, ok := parseIntParam(r.PathValue("addressId"))
 	if !ok {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid address ID")
-
 		return
 	}

@@ -41,7 +37,6 @@ func (h *AlertRuleHandler) Create(w http.ResponseWriter, r *http.Request) {
 	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
 		log.Printf("Failed to decode alert request body: %v", err)
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid request body")
-
 		return
 	}

@@ -49,7 +44,6 @@ func (h *AlertRuleHandler) Create(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Printf("Failed to parse threshold: %v", err)
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "threshold must be a valid number")
-
 		return
 	}

@@ -57,18 +51,16 @@ func (h *AlertRuleHandler) Create(w http.ResponseWriter, r *http.Request) {

 	if body.Type == "" {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Alert type is required")
-
 		return
 	}

 	if !domain.IsValidAlertType(body.Type) {
 		types := make([]string, len(domain.ValidAlertTypes))
 		for i, t := range domain.ValidAlertTypes {
-			types[i] = t.String()
+			types[i] = string(t)
 		}
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR",
-			"Invalid alert type. Must be one of: "+strings.Join(types, ", "))
-
+			fmt.Sprintf("Invalid alert type. Must be one of: %s", strings.Join(types, ", ")))
 		return
 	}

@@ -77,7 +69,6 @@ func (h *AlertRuleHandler) Create(w http.ResponseWriter, r *http.Request) {
 		if threshold == nil || *threshold <= 0 {
 			writeError(w, http.StatusBadRequest, "VALIDATION_ERROR",
 				fmt.Sprintf("Alert type '%s' requires a positive threshold value", body.Type))
-
 			return
 		}
 	}
@@ -86,13 +77,11 @@ func (h *AlertRuleHandler) Create(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Printf("Error finding address: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to create alert rule")
-
 		return
 	}
 	if addr == nil {
 		log.Printf("Address %d not found or not owned by user", addressID)
 		writeError(w, http.StatusNotFound, "NOT_FOUND", "Address not found")
-
 		return
 	}

@@ -100,7 +89,6 @@ func (h *AlertRuleHandler) Create(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Printf("Error creating alert rule: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to create alert rule")
-
 		return
 	}

@@ -110,12 +98,12 @@ func (h *AlertRuleHandler) Create(w http.ResponseWriter, r *http.Request) {

 func parseThreshold(raw json.RawMessage) (*float64, error) {
 	if len(raw) == 0 {
-		return nil, nil //nolint:nilnil
+		return nil, nil
 	}

 	// Check null before number -- json.Unmarshal treats null as valid for float64 (sets to 0).
 	if string(raw) == "null" {
-		return nil, nil //nolint:nilnil
+		return nil, nil
 	}

 	var asNumber float64
@@ -127,26 +115,23 @@ func parseThreshold(raw json.RawMessage) (*float64, error) {
 	if err := json.Unmarshal(raw, &asString); err == nil {
 		asString = strings.TrimSpace(asString)
 		if asString == "" {
-			return nil, nil //nolint:nilnil
+			return nil, nil
 		}
 		parsed, parseErr := strconv.ParseFloat(asString, 64)
 		if parseErr != nil {
 			return nil, parseErr
 		}
-
 		return &parsed, nil
 	}

-	return nil, errThresholdFormat
+	return nil, fmt.Errorf("unsupported threshold format")
 }

-// ListByAddress handles GET requests to list alert rules for an address.
 func (h *AlertRuleHandler) ListByAddress(w http.ResponseWriter, r *http.Request) {
 	userID := middleware.GetUserID(r.Context())
 	addressID, ok := parseIntParam(r.PathValue("addressId"))
 	if !ok {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid address ID")
-
 		return
 	}

@@ -156,13 +141,11 @@ func (h *AlertRuleHandler) ListByAddress(w http.ResponseWriter, r *http.Request)
 	if err != nil {
 		log.Printf("Error finding address: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to list alerts")
-
 		return
 	}
 	if addr == nil {
 		log.Printf("Address %d not found or not owned by user", addressID)
 		writeError(w, http.StatusNotFound, "NOT_FOUND", "Address not found")
-
 		return
 	}

@@ -170,7 +153,6 @@ func (h *AlertRuleHandler) ListByAddress(w http.ResponseWriter, r *http.Request)
 	if err != nil {
 		log.Printf("Error listing alerts: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to list alerts")
-
 		return
 	}

@@ -182,13 +164,11 @@ func (h *AlertRuleHandler) ListByAddress(w http.ResponseWriter, r *http.Request)
 	writeJSON(w, http.StatusOK, alerts)
 }

-// UpdateStatus handles PATCH requests to enable or disable an alert rule.
 func (h *AlertRuleHandler) UpdateStatus(w http.ResponseWriter, r *http.Request) {
 	userID := middleware.GetUserID(r.Context())
 	alertID, ok := parseIntParam(r.PathValue("alertId"))
 	if !ok {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid alert ID")
-
 		return
 	}

@@ -198,7 +178,6 @@ func (h *AlertRuleHandler) UpdateStatus(w http.ResponseWriter, r *http.Request)
 	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
 		log.Printf("Failed to decode update request body: %v", err)
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid request body")
-
 		return
 	}

@@ -206,7 +185,6 @@ func (h *AlertRuleHandler) UpdateStatus(w http.ResponseWriter, r *http.Request)

 	if body.Enabled == nil {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "enabled must be a boolean value")
-
 		return
 	}

@@ -214,13 +192,11 @@ func (h *AlertRuleHandler) UpdateStatus(w http.ResponseWriter, r *http.Request)
 	if err != nil {
 		log.Printf("Error finding alert: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to update alert")
-
 		return
 	}
 	if alert == nil {
 		log.Printf("Alert %d not found or not owned by user", alertID)
 		writeError(w, http.StatusNotFound, "NOT_FOUND", "Alert rule not found")
-
 		return
 	}

@@ -228,7 +204,6 @@ func (h *AlertRuleHandler) UpdateStatus(w http.ResponseWriter, r *http.Request)
 	if err != nil {
 		log.Printf("Error updating alert: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to update alert")
-
 		return
 	}

@@ -236,13 +211,11 @@ func (h *AlertRuleHandler) UpdateStatus(w http.ResponseWriter, r *http.Request)
 	writeJSON(w, http.StatusOK, updated)
 }

-// Remove handles DELETE requests to remove an alert rule.
 func (h *AlertRuleHandler) Remove(w http.ResponseWriter, r *http.Request) {
 	userID := middleware.GetUserID(r.Context())
 	alertID, ok := parseIntParam(r.PathValue("alertId"))
 	if !ok {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid alert ID")
-
 		return
 	}

@@ -252,20 +225,17 @@ func (h *AlertRuleHandler) Remove(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Printf("Error finding alert: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to delete alert")
-
 		return
 	}
 	if alert == nil {
 		log.Printf("Alert %d not found or not owned by user", alertID)
 		writeError(w, http.StatusNotFound, "NOT_FOUND", "Alert rule not found")
-
 		return
 	}

 	if _, err := h.alertRules.Remove(r.Context(), alertID); err != nil {
 		log.Printf("Error deleting alert: %v", err)
 		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to delete alert")
-
 		return
 	}

--- a/backend-go/internal/handlers/alert_rule_test.go
+++ b/backend-go/internal/handlers/alert_rule_test.go
@@ -1,4 +1,3 @@
-//nolint:testpackage // parseThreshold is unexported; internal test package required
 package handlers

 import (
@@ -7,13 +6,8 @@ import (
 	"testing"
 )

-//nolint:gocognit
 func TestParseThreshold(t *testing.T) {
-	t.Parallel()
-
 	t.Run("nil/empty raw message returns nil", func(t *testing.T) {
-		t.Parallel()
-
 		val, err := parseThreshold(nil)
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -24,8 +18,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("empty slice returns nil", func(t *testing.T) {
-		t.Parallel()
-
 		val, err := parseThreshold(json.RawMessage{})
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -36,8 +28,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("JSON null returns nil", func(t *testing.T) {
-		t.Parallel()
-
 		val, err := parseThreshold(json.RawMessage("null"))
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -48,8 +38,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("number 10 returns 10.0", func(t *testing.T) {
-		t.Parallel()
-
 		val, err := parseThreshold(json.RawMessage("10"))
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -63,8 +51,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("number 0.5 returns 0.5", func(t *testing.T) {
-		t.Parallel()
-
 		val, err := parseThreshold(json.RawMessage("0.5"))
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -75,8 +61,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("string '10' returns 10.0", func(t *testing.T) {
-		t.Parallel()
-
 		val, err := parseThreshold(json.RawMessage(`"10"`))
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -87,8 +71,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("string '0.001' returns 0.001", func(t *testing.T) {
-		t.Parallel()
-
 		val, err := parseThreshold(json.RawMessage(`"0.001"`))
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -99,8 +81,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("string with spaces '  10  ' returns 10.0", func(t *testing.T) {
-		t.Parallel()
-
 		val, err := parseThreshold(json.RawMessage(`"  10  "`))
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -111,8 +91,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("empty string returns nil", func(t *testing.T) {
-		t.Parallel()
-
 		val, err := parseThreshold(json.RawMessage(`""`))
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -123,8 +101,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("whitespace-only string returns nil", func(t *testing.T) {
-		t.Parallel()
-
 		val, err := parseThreshold(json.RawMessage(`"   "`))
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -135,8 +111,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("invalid string returns error", func(t *testing.T) {
-		t.Parallel()
-
 		_, err := parseThreshold(json.RawMessage(`"abc"`))
 		if err == nil {
 			t.Fatal("expected error for non-numeric string")
@@ -144,8 +118,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("boolean returns error", func(t *testing.T) {
-		t.Parallel()
-
 		_, err := parseThreshold(json.RawMessage("true"))
 		if err == nil {
 			t.Fatal("expected error for boolean")
@@ -153,8 +125,6 @@ func TestParseThreshold(t *testing.T) {
 	})

 	t.Run("array returns error", func(t *testing.T) {
-		t.Parallel()
-
 		_, err := parseThreshold(json.RawMessage("[1,2]"))
 		if err == nil {
 			t.Fatal("expected error for array")
@@ -162,10 +132,7 @@ func TestParseThreshold(t *testing.T) {
 	})
 }

-//nolint:funlen
 func TestDecodeAlertBody(t *testing.T) {
-	t.Parallel()
-
 	// Verifies that the struct used in Create handler can decode all
 	// payload shapes the frontend might send.

@@ -216,15 +183,12 @@ func TestDecodeAlertBody(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
 			var body alertBody
 			err := json.Unmarshal([]byte(tt.payload), &body)
 			if tt.wantErr {
 				if err == nil {
 					t.Fatal("expected decode error")
 				}
-
 				return
 			}
 			if err != nil {
@@ -235,8 +199,6 @@ func TestDecodeAlertBody(t *testing.T) {
 }

 func TestOldStructFailsWithStringThreshold(t *testing.T) {
-	t.Parallel()
-
 	// Documents the original bug: *float64 cannot decode a string threshold.
 	type oldAlertBody struct {
 		Type      string   `json:"type"`
--- a/backend-go/internal/handlers/email_digest.go
+++ b/backend-go/internal/handlers/email_digest.go
@@ -1,101 +0,0 @@
-package handlers
-
-import (
-	"log"
-	"net/http"
-
-	"github.com/kjannette/koin-ping/backend-go/internal/middleware"
-	"github.com/kjannette/koin-ping/backend-go/internal/models"
-	"github.com/kjannette/koin-ping/backend-go/internal/services"
-)
-
-type EmailDigestHandler struct {
-	digestSvc *services.EmailDigestService
-	configs   *models.NotificationConfigModel
-}
-
-func NewEmailDigestHandler(
-	digestSvc *services.EmailDigestService,
-	configs *models.NotificationConfigModel,
-) *EmailDigestHandler {
-	return &EmailDigestHandler{digestSvc: digestSvc, configs: configs}
-}
-
-// SetupEmail reads the user's email from their notification config and sends
-// a confirmation message via Resend to verify the integration works.
-func (h *EmailDigestHandler) SetupEmail(w http.ResponseWriter, r *http.Request) {
-	userID := middleware.GetUserID(r.Context())
-
-	if !h.digestSvc.Configured() {
-		writeError(w, http.StatusServiceUnavailable, "EMAIL_NOT_CONFIGURED",
-			"Email service is not configured on the server")
-		return
-	}
-
-	cfg, err := h.configs.GetConfig(r.Context(), userID)
-	if err != nil {
-		log.Printf("Error getting notification config for email setup: %v", err)
-		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR",
-			"Failed to load notification config")
-		return
-	}
-
-	if cfg == nil || cfg.Email == nil || *cfg.Email == "" {
-		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR",
-			"Save an email address in notification settings first")
-		return
-	}
-
-	if err := h.digestSvc.SetupEmail(*cfg.Email); err != nil {
-		log.Printf("Email setup failed for user %s: %v", userID, err)
-		writeError(w, http.StatusBadGateway, "EMAIL_SEND_FAILED",
-			"Failed to send confirmation email — check server email config")
-		return
-	}
-
-	log.Printf("Email setup confirmation sent to user %s (%s)", userID, *cfg.Email)
-	writeJSON(w, http.StatusOK, map[string]any{
-		"success": true,
-		"email":   *cfg.Email,
-		"message": "Confirmation email sent",
-	})
-}
-
-// SendDigest compiles and sends a digest of recent alerts to the user's email.
-func (h *EmailDigestHandler) SendDigest(w http.ResponseWriter, r *http.Request) {
-	userID := middleware.GetUserID(r.Context())
-
-	if !h.digestSvc.Configured() {
-		writeError(w, http.StatusServiceUnavailable, "EMAIL_NOT_CONFIGURED",
-			"Email service is not configured on the server")
-		return
-	}
-
-	cfg, err := h.configs.GetConfig(r.Context(), userID)
-	if err != nil {
-		log.Printf("Error getting notification config for digest: %v", err)
-		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR",
-			"Failed to load notification config")
-		return
-	}
-
-	if cfg == nil || cfg.Email == nil || *cfg.Email == "" {
-		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR",
-			"No email address configured")
-		return
-	}
-
-	if err := h.digestSvc.SendDigest(r.Context(), userID, *cfg.Email); err != nil {
-		log.Printf("Digest send failed for user %s: %v", userID, err)
-		writeError(w, http.StatusBadGateway, "DIGEST_SEND_FAILED",
-			"Failed to send digest email")
-		return
-	}
-
-	log.Printf("Digest sent to user %s (%s)", userID, *cfg.Email)
-	writeJSON(w, http.StatusOK, map[string]any{
-		"success": true,
-		"email":   *cfg.Email,
-		"message": "Digest email sent",
-	})
-}
--- a/backend-go/internal/handlers/notification_config.go
+++ b/backend-go/internal/handlers/notification_config.go
@@ -7,7 +7,6 @@ import (
 	"regexp"
 	"strings"

-	"github.com/kjannette/koin-ping/backend-go/internal/config"
 	"github.com/kjannette/koin-ping/backend-go/internal/domain"
 	"github.com/kjannette/koin-ping/backend-go/internal/middleware"
 	"github.com/kjannette/koin-ping/backend-go/internal/models"
@@ -18,11 +17,10 @@ var emailRe = regexp.MustCompile(`^[^\s@]+@[^\s@]+\.[^\s@]+$`)

 type NotificationConfigHandler struct {
 	configs *models.NotificationConfigModel
-	cfg     *config.Config
 }

-func NewNotificationConfigHandler(configs *models.NotificationConfigModel, cfg *config.Config) *NotificationConfigHandler {
-	return &NotificationConfigHandler{configs: configs, cfg: cfg}
+func NewNotificationConfigHandler(configs *models.NotificationConfigModel) *NotificationConfigHandler {
+	return &NotificationConfigHandler{configs: configs}
 }

 func (h *NotificationConfigHandler) GetConfig(w http.ResponseWriter, r *http.Request) {
@@ -53,10 +51,8 @@ func (h *NotificationConfigHandler) UpdateConfig(w http.ResponseWriter, r *http.

 	var body struct {
 		DiscordWebhookURL   *string `json:"discord_webhook_url"`
-		TelegramChatID      *string `json:"telegram_chat_id"`
-		TelegramBotToken    *string `json:"telegram_bot_token"`
-		Email               *string `json:"email"`
 		SlackWebhookURL     *string `json:"slack_webhook_url"`
+		Email               *string `json:"email"`
 		NotificationEnabled *bool   `json:"notification_enabled"`
 	}
 	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
@@ -67,9 +63,8 @@ func (h *NotificationConfigHandler) UpdateConfig(w http.ResponseWriter, r *http.

 	log.Printf("User %s updating notification config", userID)

-	if body.DiscordWebhookURL == nil && body.TelegramChatID == nil &&
-		body.TelegramBotToken == nil && body.Email == nil &&
-		body.SlackWebhookURL == nil && body.NotificationEnabled == nil {
+	if body.DiscordWebhookURL == nil && body.SlackWebhookURL == nil &&
+		body.Email == nil && body.NotificationEnabled == nil {
 		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR",
 			"At least one configuration field must be provided")
 		return
@@ -102,10 +97,8 @@ func (h *NotificationConfigHandler) UpdateConfig(w http.ResponseWriter, r *http.

 	cfg := domain.NotificationConfig{
 		DiscordWebhookURL:   body.DiscordWebhookURL,
-		TelegramChatID:      body.TelegramChatID,
-		TelegramBotToken:    body.TelegramBotToken,
-		Email:               body.Email,
 		SlackWebhookURL:     body.SlackWebhookURL,
+		Email:               body.Email,
 		NotificationEnabled: enabled,
 	}

@@ -142,75 +135,49 @@ func (h *NotificationConfigHandler) DeleteConfig(w http.ResponseWriter, r *http.
 	w.WriteHeader(http.StatusNoContent)
 }

-// TestChannels sends a test message to all configured notification channels.
-func (h *NotificationConfigHandler) TestChannels(w http.ResponseWriter, r *http.Request) {
-	userID := middleware.GetUserID(r.Context())
-	log.Printf("User %s testing notification channels", userID)
+func (h *NotificationConfigHandler) TestWebhook(w http.ResponseWriter, r *http.Request) {
+	_ = middleware.GetUserID(r.Context())
+
+	var body struct {
+		Type string `json:"type"`
+		URL  string `json:"url"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid request body")
+		return
+	}
+
+	if body.URL == "" {
+		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "URL is required")
+		return
+	}
+
+	var ok bool
+	var err error
+
+	switch body.Type {
+	case "slack":
+		if !strings.HasPrefix(body.URL, "https://hooks.slack.com/") {
+			writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid Slack webhook URL")
+			return
+		}
+		ok, err = notifications.TestSlackWebhook(body.URL)
+	case "discord":
+		if !strings.HasPrefix(body.URL, "https://discord.com/api/webhooks/") {
+			writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Invalid Discord webhook URL")
+			return
+		}
+		ok, err = notifications.TestDiscordWebhook(body.URL)
+	default:
+		writeError(w, http.StatusBadRequest, "VALIDATION_ERROR", "Type must be 'slack' or 'discord'")
+		return
+	}

-	cfg, err := h.configs.GetConfig(r.Context(), userID)
 	if err != nil {
-		log.Printf("Error getting notification config for test: %v", err)
-		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to get notification config")
+		log.Printf("Webhook test failed: %v", err)
+		writeJSON(w, http.StatusOK, map[string]interface{}{"success": false, "error": err.Error()})
 		return
 	}

-	if cfg == nil {
-		writeError(w, http.StatusNotFound, "NOT_FOUND", "No notification configuration found")
-		return
-	}
-
-	type channelResult struct {
-		Channel string `json:"channel"`
-		Success bool   `json:"success"`
-		Error   string `json:"error,omitempty"`
-	}
-
-	var results []channelResult
-
-	if cfg.DiscordWebhookURL != nil && *cfg.DiscordWebhookURL != "" {
-		ok, testErr := notifications.TestDiscordWebhook(*cfg.DiscordWebhookURL)
-		res := channelResult{Channel: "discord", Success: ok}
-		if testErr != nil {
-			res.Error = testErr.Error()
-		}
-		results = append(results, res)
-	}
-
-	if cfg.TelegramBotToken != nil && *cfg.TelegramBotToken != "" &&
-		cfg.TelegramChatID != nil && *cfg.TelegramChatID != "" {
-		ok, testErr := notifications.TestTelegramWebhook(*cfg.TelegramBotToken, *cfg.TelegramChatID)
-		res := channelResult{Channel: "telegram", Success: ok}
-		if testErr != nil {
-			res.Error = testErr.Error()
-		}
-		results = append(results, res)
-	}
-
-	if cfg.SlackWebhookURL != nil && *cfg.SlackWebhookURL != "" {
-		ok, testErr := notifications.TestSlackWebhook(*cfg.SlackWebhookURL)
-		res := channelResult{Channel: "slack", Success: ok}
-		if testErr != nil {
-			res.Error = testErr.Error()
-		}
-		results = append(results, res)
-	}
-
-	if cfg.Email != nil && *cfg.Email != "" {
-		ok, testErr := notifications.TestEmailNotification(
-			h.cfg.ResendAPIKey, h.cfg.EmailFrom, *cfg.Email,
-		)
-		res := channelResult{Channel: "email", Success: ok}
-		if testErr != nil {
-			res.Error = testErr.Error()
-		}
-		results = append(results, res)
-	}
-
-	if len(results) == 0 {
-		writeError(w, http.StatusBadRequest, "NO_CHANNELS",
-			"No notification channels are configured")
-		return
-	}
-
-	writeJSON(w, http.StatusOK, map[string]any{"results": results})
+	writeJSON(w, http.StatusOK, map[string]interface{}{"success": ok})
 }
--- a/backend-go/internal/handlers/status.go
+++ b/backend-go/internal/handlers/status.go
@@ -1,67 +1,15 @@
 package handlers

 import (
+	"context"
 	"log"
 	"net/http"
 	"time"

 	"github.com/kjannette/koin-ping/backend-go/internal/models"
+	"github.com/kjannette/koin-ping/backend-go/internal/protocols/ethereum"
 )

-// StatusHandler handles the system status endpoint.
-type StatusHandler struct {
-	checkpoints *models.CheckpointModel
-}
-
-// NewStatusHandler creates a new StatusHandler.
-func NewStatusHandler(checkpoints *models.CheckpointModel) *StatusHandler {
-	return &StatusHandler{checkpoints: checkpoints}
-}
-
-// GetStatus returns real-time system status derived from checkpoint data.
-func (h *StatusHandler) GetStatus(w http.ResponseWriter, r *http.Request) {
-	block, checkedAt, err := h.checkpoints.GetLatestBlock(r.Context())
-	if err != nil {
-		log.Printf("Error querying latest block: %v", err)
-		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to get system status")
-
-		return
-	}
-
-	latestBlock := 0
-	lag := 0
-	status := "starting"
-
-	if checkedAt != nil {
-		lag = int(time.Since(*checkedAt).Seconds())
-		if lag > 600 { //nolint:mnd
-			status = "idle"
-		} else {
-			status = "active"
-		}
-	}
-
-	if block != nil {
-		latestBlock = *block
-	}
-
-	writeJSON(w, http.StatusOK, map[string]interface{}{
-		"status":        status,
-		"latestBlock":   latestBlock,
-		"lag":           lag,
-		"lastCheckedAt": checkedAtStr(checkedAt),
-		"timestamp":     time.Now().UTC().Format(time.RFC3339),
-	})
-}
-
-func checkedAtStr(t *time.Time) string {
-	if t == nil {
-		return ""
-	}
-
-	return t.UTC().Format(time.RFC3339)
-}
-
 func HealthCheck(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, map[string]interface{}{
 		"status":    "ok",
@@ -69,3 +17,63 @@ func HealthCheck(w http.ResponseWriter, r *http.Request) {
 		"service":   "koin-ping-backend",
 	})
 }
+
+type StatusHandler struct {
+	eth         ethereum.EthereumObserver
+	checkpoints *models.CheckpointModel
+}
+
+func NewStatusHandler(eth ethereum.EthereumObserver, checkpoints *models.CheckpointModel) *StatusHandler {
+	return &StatusHandler{eth: eth, checkpoints: checkpoints}
+}
+
+func (h *StatusHandler) SystemStatus(w http.ResponseWriter, r *http.Request) {
+	ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
+	defer cancel()
+
+	status := "healthy"
+
+	if h.eth == nil {
+		writeJSON(w, http.StatusOK, map[string]interface{}{
+			"latestBlock":      0,
+			"lag":              0,
+			"trackedAddresses": 0,
+			"status":           "no_rpc",
+			"timestamp":        time.Now().UTC().Format(time.RFC3339),
+		})
+		return
+	}
+
+	latestBlock, err := h.eth.GetLatestBlockNumber(ctx)
+	if err != nil {
+		log.Printf("Failed to get latest block: %v", err)
+		status = "degraded"
+		latestBlock = 0
+	}
+
+	lag := 0
+	checkpoints, err := h.checkpoints.ListAll(ctx)
+	if err != nil {
+		log.Printf("Failed to list checkpoints: %v", err)
+	} else if len(checkpoints) > 0 && latestBlock > 0 {
+		minChecked := checkpoints[0].LastCheckedBlock
+		for _, cp := range checkpoints[1:] {
+			if cp.LastCheckedBlock < minChecked {
+				minChecked = cp.LastCheckedBlock
+			}
+		}
+		lag = latestBlock - minChecked
+	}
+
+	if lag > 50 {
+		status = "syncing"
+	}
+
+	writeJSON(w, http.StatusOK, map[string]interface{}{
+		"latestBlock":      latestBlock,
+		"lag":              lag,
+		"trackedAddresses": len(checkpoints),
+		"status":           status,
+		"timestamp":        time.Now().UTC().Format(time.RFC3339),
+	})
+}
--- a/backend-go/internal/middleware/auth.go
+++ b/backend-go/internal/middleware/auth.go
@@ -1,4 +1,3 @@
-// Package middleware provides HTTP middleware for authentication and context injection.
 package middleware

 import (
--- a/backend-go/internal/models/address.go
+++ b/backend-go/internal/models/address.go
@@ -2,9 +2,7 @@ package models

 import (
 	"context"
-	"errors"

-	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/kjannette/koin-ping/backend-go/internal/domain"
 )
@@ -99,25 +97,7 @@ func (m *AddressModel) FindByID(ctx context.Context, id int, userID *string) (*d
 	}

 	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
-			return nil, nil
-		}
-		return nil, err
-	}
-	return &a, nil
-}
-
-// UpdateLabel updates the label for an address owned by userID.
-// Returns nil, nil if no row matched (address not found or not owned by user).
-func (m *AddressModel) UpdateLabel(ctx context.Context, id int, userID string, label *string) (*domain.Address, error) {
-	var a domain.Address
-	err := m.pool.QueryRow(ctx,
-		`UPDATE addresses SET label = $3 WHERE id = $1 AND user_id = $2
-		 RETURNING id, user_id, address, label, created_at`,
-		id, userID, label,
-	).Scan(&a.ID, &a.UserID, &a.Address, &a.Label, &a.CreatedAt)
-	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
+		if err.Error() == "no rows in result set" {
 			return nil, nil
 		}
 		return nil, err
--- a/backend-go/internal/models/alert_event.go
+++ b/backend-go/internal/models/alert_event.go
@@ -2,9 +2,7 @@ package models

 import (
 	"context"
-	"errors"

-	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/kjannette/koin-ping/backend-go/internal/domain"
 )
@@ -73,15 +71,10 @@ func (m *AlertEventModel) Create(ctx context.Context, alertRuleID int, message s
 	err := m.pool.QueryRow(ctx,
 		`INSERT INTO alert_events (alert_rule_id, message, address_label, tx_hash)
 		 VALUES ($1, $2, $3, $4)
-		 ON CONFLICT DO NOTHING
 		 RETURNING id, alert_rule_id, message, address_label, tx_hash, timestamp`,
 		alertRuleID, message, addressLabel, txHash,
 	).Scan(&e.ID, &e.AlertRuleID, &e.Message, &e.AddressLabel, &e.TxHash, &e.Timestamp)
 	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
-			// Duplicate silently skipped by ON CONFLICT DO NOTHING
-			return nil, nil
-		}
 		return nil, err
 	}
 	return &e, nil
--- a/backend-go/internal/models/alert_rule.go
+++ b/backend-go/internal/models/alert_rule.go
@@ -2,9 +2,7 @@ package models

 import (
 	"context"
-	"errors"

-	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/kjannette/koin-ping/backend-go/internal/domain"
 )
@@ -23,7 +21,7 @@ func (m *AlertRuleModel) Create(ctx context.Context, addressID int, alertType do
 		`INSERT INTO alert_rules (address_id, type, threshold, enabled)
 		 VALUES ($1, $2, $3, TRUE)
 		 RETURNING id, address_id, type, threshold, enabled, created_at`,
-		addressID, alertType.String(), threshold,
+		addressID, string(alertType), threshold,
 	).Scan(&r.ID, &r.AddressID, &r.Type, &r.Threshold, &r.Enabled, &r.CreatedAt)
 	if err != nil {
 		return nil, err
@@ -77,7 +75,7 @@ func (m *AlertRuleModel) FindByID(ctx context.Context, id int, userID *string) (
 	}

 	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
+		if err.Error() == "no rows in result set" {
 			return nil, nil
 		}
 		return nil, err
@@ -95,7 +93,7 @@ func (m *AlertRuleModel) UpdateEnabled(ctx context.Context, id int, enabled bool
 		id, enabled,
 	).Scan(&r.ID, &r.AddressID, &r.Type, &r.Threshold, &r.Enabled, &r.CreatedAt)
 	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
+		if err.Error() == "no rows in result set" {
 			return nil, nil
 		}
 		return nil, err
--- a/backend-go/internal/models/checkpoint.go
+++ b/backend-go/internal/models/checkpoint.go
@@ -2,10 +2,7 @@ package models

 import (
 	"context"
-	"errors"
-	"time"

-	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/kjannette/koin-ping/backend-go/internal/domain"
 )
@@ -18,20 +15,6 @@ func NewCheckpointModel(pool *pgxpool.Pool) *CheckpointModel {
 	return &CheckpointModel{pool: pool}
 }

-// GetLatestBlock returns the highest last_checked_block and its timestamp across all addresses.
-// Returns nil, nil, nil when no checkpoints exist yet.
-func (m *CheckpointModel) GetLatestBlock(ctx context.Context) (*int, *time.Time, error) {
-	var block *int
-	var checkedAt *time.Time
-	err := m.pool.QueryRow(ctx,
-		`SELECT MAX(last_checked_block), MAX(last_checked_at) FROM address_checkpoints`,
-	).Scan(&block, &checkedAt)
-	if err != nil {
-		return nil, nil, err
-	}
-	return block, checkedAt, nil
-}
-
 // GetLastCheckedBlock returns the last checked block for an address, or -1 if never checked.
 func (m *CheckpointModel) GetLastCheckedBlock(ctx context.Context, addressID int) (int, bool, error) {
 	var block int
@@ -40,7 +23,7 @@ func (m *CheckpointModel) GetLastCheckedBlock(ctx context.Context, addressID int
 		addressID,
 	).Scan(&block)
 	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
+		if err.Error() == "no rows in result set" {
 			return 0, false, nil
 		}
 		return 0, false, err
--- a/backend-go/internal/models/notification_config.go
+++ b/backend-go/internal/models/notification_config.go
@@ -2,9 +2,7 @@ package models

 import (
 	"context"
-	"errors"

-	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/kjannette/koin-ping/backend-go/internal/domain"
 )
@@ -20,15 +18,15 @@ func NewNotificationConfigModel(pool *pgxpool.Pool) *NotificationConfigModel {
 func (m *NotificationConfigModel) GetConfig(ctx context.Context, userID string) (*domain.NotificationConfig, error) {
 	var c domain.NotificationConfig
 	err := m.pool.QueryRow(ctx,
-		`SELECT user_id, discord_webhook_url, telegram_chat_id, telegram_bot_token,
-		        email, slack_webhook_url, notification_enabled, created_at, updated_at
+		`SELECT user_id, discord_webhook_url, slack_webhook_url,
+		        email, notification_enabled, created_at, updated_at
 		 FROM user_notification_configs
 		 WHERE user_id = $1`,
 		userID,
-	).Scan(&c.UserID, &c.DiscordWebhookURL, &c.TelegramChatID, &c.TelegramBotToken,
-		&c.Email, &c.SlackWebhookURL, &c.NotificationEnabled, &c.CreatedAt, &c.UpdatedAt)
+	).Scan(&c.UserID, &c.DiscordWebhookURL, &c.SlackWebhookURL,
+		&c.Email, &c.NotificationEnabled, &c.CreatedAt, &c.UpdatedAt)
 	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
+		if err.Error() == "no rows in result set" {
 			return nil, nil
 		}
 		return nil, err
@@ -40,24 +38,21 @@ func (m *NotificationConfigModel) UpsertConfig(ctx context.Context, userID strin
 	var c domain.NotificationConfig
 	err := m.pool.QueryRow(ctx,
 		`INSERT INTO user_notification_configs
-		   (user_id, discord_webhook_url, telegram_chat_id, telegram_bot_token,
-		    email, slack_webhook_url, notification_enabled, updated_at)
-		 VALUES ($1, $2, $3, $4, $5, $6, $7, NOW())
+		   (user_id, discord_webhook_url, slack_webhook_url, email, notification_enabled, updated_at)
+		 VALUES ($1, $2, $3, $4, $5, NOW())
 		 ON CONFLICT (user_id)
 		 DO UPDATE SET
-		   discord_webhook_url = $2,
-		   telegram_chat_id = $3,
-		   telegram_bot_token = $4,
-		   email = $5,
-		   slack_webhook_url = $6,
-		   notification_enabled = $7,
+		   discord_webhook_url = COALESCE($2, user_notification_configs.discord_webhook_url),
+		   slack_webhook_url = COALESCE($3, user_notification_configs.slack_webhook_url),
+		   email = COALESCE($4, user_notification_configs.email),
+		   notification_enabled = $5,
 		   updated_at = NOW()
-		 RETURNING user_id, discord_webhook_url, telegram_chat_id, telegram_bot_token,
-		           email, slack_webhook_url, notification_enabled, created_at, updated_at`,
-		userID, cfg.DiscordWebhookURL, cfg.TelegramChatID, cfg.TelegramBotToken,
-		cfg.Email, cfg.SlackWebhookURL, cfg.NotificationEnabled,
-	).Scan(&c.UserID, &c.DiscordWebhookURL, &c.TelegramChatID, &c.TelegramBotToken,
-		&c.Email, &c.SlackWebhookURL, &c.NotificationEnabled, &c.CreatedAt, &c.UpdatedAt)
+		 RETURNING user_id, discord_webhook_url, slack_webhook_url,
+		           email, notification_enabled, created_at, updated_at`,
+		userID, cfg.DiscordWebhookURL, cfg.SlackWebhookURL,
+		cfg.Email, cfg.NotificationEnabled,
+	).Scan(&c.UserID, &c.DiscordWebhookURL, &c.SlackWebhookURL,
+		&c.Email, &c.NotificationEnabled, &c.CreatedAt, &c.UpdatedAt)
 	if err != nil {
 		return nil, err
 	}
@@ -77,8 +72,7 @@ func (m *NotificationConfigModel) Remove(ctx context.Context, userID string) (bo

 func (m *NotificationConfigModel) ListEnabled(ctx context.Context) ([]domain.NotificationConfig, error) {
 	rows, err := m.pool.Query(ctx,
-		`SELECT user_id, discord_webhook_url, telegram_chat_id, telegram_bot_token,
-		        email, slack_webhook_url
+		`SELECT user_id, discord_webhook_url, slack_webhook_url, email
 		 FROM user_notification_configs
 		 WHERE notification_enabled = TRUE`,
 	)
@@ -90,8 +84,7 @@ func (m *NotificationConfigModel) ListEnabled(ctx context.Context) ([]domain.Not
 	var configs []domain.NotificationConfig
 	for rows.Next() {
 		var c domain.NotificationConfig
-		if err := rows.Scan(&c.UserID, &c.DiscordWebhookURL, &c.TelegramChatID,
-			&c.TelegramBotToken, &c.Email, &c.SlackWebhookURL); err != nil {
+		if err := rows.Scan(&c.UserID, &c.DiscordWebhookURL, &c.SlackWebhookURL, &c.Email); err != nil {
 			return nil, err
 		}
 		c.NotificationEnabled = true
--- a/backend-go/internal/notifications/discord.go
+++ b/backend-go/internal/notifications/discord.go
@@ -2,7 +2,6 @@ package notifications

 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -10,31 +9,11 @@ import (
 	"time"
 )

-const (
-	// discordHTTPTimeoutSeconds is the timeout for Discord webhook requests.
-	discordHTTPTimeoutSeconds = 10
-
-	// Alert color codes for Discord embeds.
-	colorGreen  = 0x00ff00
-	colorOrange = 0xff9900
-	colorRed    = 0xff0000
-	colorBlue   = 0x0099ff
-)
-
-// discordHTTPClient is a shared HTTP client with a timeout for Discord requests.
-var discordHTTPClient = &http.Client{ //nolint:gochecknoglobals
-	Timeout: discordHTTPTimeoutSeconds * time.Second,
-}
-
-// DiscordNotifier sends alert notifications via a Discord webhook.
-type DiscordNotifier struct {
-	WebhookURL string
-}
-
-// Send implements Notifier for Discord.
-func (d *DiscordNotifier) Send(_ context.Context, message string, meta AlertMetadata) error {
-	_, err := SendDiscordNotification(d.WebhookURL, message, meta)
-	return err
+type AlertMetadata struct {
+	TxHash       string
+	AddressLabel string
+	AlertType    string
+	Address      string
 }

 type discordEmbed struct {
@@ -94,9 +73,7 @@ func SendDiscordNotification(webhookURL, message string, meta AlertMetadata) (bo
 		return false, fmt.Errorf("marshal discord payload: %w", err)
 	}

-	resp, err := discordHTTPClient.Post(
-		webhookURL, "application/json", bytes.NewReader(body),
-	)
+	resp, err := http.Post(webhookURL, "application/json", bytes.NewReader(body))
 	if err != nil {
 		log.Printf("Failed to send Discord notification: %v", err)
 		return false, err
@@ -121,9 +98,7 @@ func TestDiscordWebhook(webhookURL string) (bool, error) {
 		return false, err
 	}

-	resp, err := discordHTTPClient.Post(
-		webhookURL, "application/json", bytes.NewReader(body),
-	)
+	resp, err := http.Post(webhookURL, "application/json", bytes.NewReader(body))
 	if err != nil {
 		log.Printf("Discord webhook test failed: %v", err)
 		return false, err
@@ -136,14 +111,14 @@ func TestDiscordWebhook(webhookURL string) (bool, error) {
 func colorForAlertType(alertType string) int {
 	switch alertType {
 	case "incoming_tx":
-		return colorGreen
+		return 0x00ff00 // Green
 	case "outgoing_tx":
-		return colorOrange
+		return 0xff9900 // Orange
 	case "large_transfer":
-		return colorRed
+		return 0xff0000 // Red
 	case "balance_below":
-		return colorRed
+		return 0xff0000 // Red
 	default:
-		return colorBlue
+		return 0x0099ff // Blue
 	}
 }
--- a/backend-go/internal/notifications/discord_test.go
+++ b/backend-go/internal/notifications/discord_test.go
@@ -0,0 +1,99 @@
+package notifications
+
+import (
+	"encoding/json"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestSendDiscordNotification(t *testing.T) {
+	var receivedPayload discordPayload
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPost {
+			t.Errorf("expected POST, got %s", r.Method)
+		}
+
+		body, _ := io.ReadAll(r.Body)
+		json.Unmarshal(body, &receivedPayload)
+
+		w.WriteHeader(http.StatusNoContent)
+	}))
+	defer server.Close()
+
+	meta := AlertMetadata{
+		TxHash:       "0xabc123",
+		AddressLabel: "Treasury",
+		AlertType:    "incoming_tx",
+		Address:      "0x1234567890abcdef1234567890abcdef12345678",
+	}
+
+	sent, err := SendDiscordNotification(server.URL, "Incoming transaction: 5.5 ETH received", meta)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !sent {
+		t.Fatal("expected sent to be true")
+	}
+
+	if len(receivedPayload.Embeds) != 1 {
+		t.Fatalf("expected 1 embed, got %d", len(receivedPayload.Embeds))
+	}
+	embed := receivedPayload.Embeds[0]
+	if embed.Title != "Koin Ping Alert" {
+		t.Errorf("title = %q, want %q", embed.Title, "Koin Ping Alert")
+	}
+	if embed.Color != 0x00ff00 {
+		t.Errorf("color = %x, want %x (green for incoming_tx)", embed.Color, 0x00ff00)
+	}
+	if len(embed.Fields) != 3 {
+		t.Errorf("expected 3 fields (address, blockchain address, tx), got %d", len(embed.Fields))
+	}
+}
+
+func TestSendDiscordNotification_ServerError(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusBadRequest)
+	}))
+	defer server.Close()
+
+	sent, err := SendDiscordNotification(server.URL, "test", AlertMetadata{})
+	if err == nil {
+		t.Fatal("expected error for bad response")
+	}
+	if sent {
+		t.Fatal("expected sent to be false")
+	}
+}
+
+func TestTestDiscordWebhook(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusNoContent)
+	}))
+	defer server.Close()
+
+	ok, err := TestDiscordWebhook(server.URL)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Fatal("expected ok to be true")
+	}
+}
+
+func TestColorForAlertType(t *testing.T) {
+	tests := map[string]int{
+		"incoming_tx":    0x00ff00,
+		"outgoing_tx":    0xff9900,
+		"large_transfer": 0xff0000,
+		"balance_below":  0xff0000,
+		"unknown":        0x0099ff,
+	}
+	for alertType, want := range tests {
+		if got := colorForAlertType(alertType); got != want {
+			t.Errorf("colorForAlertType(%q) = %x, want %x", alertType, got, want)
+		}
+	}
+}
--- a/backend-go/internal/notifications/email.go
+++ b/backend-go/internal/notifications/email.go
@@ -1,146 +1,101 @@
 package notifications

 import (
-	"bytes"
-	"context"
-	"encoding/json"
 	"fmt"
 	"log"
-	"net/http"
-	"time"
+	"net/smtp"
+	"strings"
 )

-// EmailNotifier sends alert notifications via email (Resend).
-type EmailNotifier struct {
-	APIKey string
+type SMTPConfig struct {
+	Host     string
+	Port     int
+	Username string
+	Password string
 	From     string
-	To     string
 }

-// Send implements Notifier for email.
-func (e *EmailNotifier) Send(_ context.Context, message string, meta AlertMetadata) error {
-	_, err := SendEmailNotification(e.APIKey, e.From, e.To, message, meta)
-	return err
+func (c *SMTPConfig) IsConfigured() bool {
+	return c.Host != "" && c.From != ""
 }

-const emailHTTPTimeoutSeconds = 10
-
-var emailHTTPClient = &http.Client{ //nolint:gochecknoglobals
-	Timeout: emailHTTPTimeoutSeconds * time.Second,
+func (c *SMTPConfig) addr() string {
+	return fmt.Sprintf("%s:%d", c.Host, c.Port)
 }

-type resendPayload struct {
-	From    string `json:"from"`
-	To      string `json:"to"`
-	Subject string `json:"subject"`
-	HTML    string `json:"html"`
+func SendEmailNotification(cfg SMTPConfig, toEmail, message string, meta AlertMetadata) (bool, error) {
+	if !cfg.IsConfigured() {
+		return false, fmt.Errorf("SMTP is not configured")
 	}

-func SendEmailNotification(apiKey, fromAddress, toAddress, message string, meta AlertMetadata) (bool, error) {
-	if apiKey == "" {
-		log.Printf("Skipping email notification: RESEND_API_KEY not configured")
-		return false, nil
+	subject := fmt.Sprintf("Koin Ping Alert: %s", humanAlertType(meta.AlertType))
+
+	body := buildEmailBody(message, meta)
+
+	msg := strings.Join([]string{
+		fmt.Sprintf("From: %s", cfg.From),
+		fmt.Sprintf("To: %s", toEmail),
+		fmt.Sprintf("Subject: %s", subject),
+		"MIME-Version: 1.0",
+		"Content-Type: text/html; charset=UTF-8",
+		"",
+		body,
+	}, "\r\n")
+
+	var auth smtp.Auth
+	if cfg.Username != "" {
+		auth = smtp.PlainAuth("", cfg.Username, cfg.Password, cfg.Host)
 	}

-	subject := fmt.Sprintf("Koin Ping Alert: %s", alertTypeLabel(meta.AlertType))
-
-	txLink := ""
-	if meta.TxHash != "" {
-		txLink = fmt.Sprintf(
-			`<p><a href="https://etherscan.io/tx/%s">View on Etherscan</a></p>`,
-			meta.TxHash,
-		)
-	}
-
-	html := fmt.Sprintf(`
-<div style="font-family: sans-serif; max-width: 600px; margin: 0 auto;">
-  <h2 style="color: #333;">Koin Ping Alert</h2>
-  <p style="font-size: 16px;">%s</p>
-  <table style="margin: 16px 0; border-collapse: collapse;">
-    <tr>
-      <td style="padding: 4px 12px 4px 0; color: #666;">Address</td>
-      <td style="padding: 4px 0;">%s</td>
-    </tr>
-    <tr>
-      <td style="padding: 4px 12px 4px 0; color: #666;">Blockchain</td>
-      <td style="padding: 4px 0; font-family: monospace; font-size: 13px;">%s</td>
-    </tr>
-  </table>
-  %s
-  <hr style="border: none; border-top: 1px solid #eee; margin: 24px 0;" />
-  <p style="font-size: 12px; color: #999;">Sent by Koin Ping</p>
-</div>`,
-		message, meta.AddressLabel, meta.Address, txLink)
-
-	payload := resendPayload{
-		From:    fromAddress,
-		To:      toAddress,
-		Subject: subject,
-		HTML:    html,
-	}
-
-	body, err := json.Marshal(payload)
+	err := smtp.SendMail(cfg.addr(), auth, cfg.From, []string{toEmail}, []byte(msg))
 	if err != nil {
-		return false, fmt.Errorf("marshal email payload: %w", err)
-	}
-
-	req, err := http.NewRequest(http.MethodPost, "https://api.resend.com/emails", bytes.NewReader(body))
-	if err != nil {
-		return false, fmt.Errorf("create email request: %w", err)
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", "Bearer "+apiKey)
-
-	resp, err := emailHTTPClient.Do(req)
-	if err != nil {
-		log.Printf("Failed to send email notification: %v", err)
+		log.Printf("Failed to send email notification to %s: %v", toEmail, err)
 		return false, err
 	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		log.Printf("Resend API failed: HTTP %d", resp.StatusCode)
-		return false, fmt.Errorf("resend API failed: HTTP %d", resp.StatusCode)
-	}

 	return true, nil
 }

-func TestEmailNotification(apiKey, fromAddress, toAddress string) (bool, error) {
-	if apiKey == "" {
-		return false, fmt.Errorf("email not configured: RESEND_API_KEY not set") //nolint:err113
+func TestEmailNotification(cfg SMTPConfig, toEmail string) (bool, error) {
+	meta := AlertMetadata{AlertType: "test"}
+	return SendEmailNotification(cfg, toEmail,
+		"This is a test notification from Koin Ping. Your email is configured correctly!", meta)
 }

-	payload := resendPayload{
-		From:    fromAddress,
-		To:      toAddress,
-		Subject: "Koin Ping — Test Notification",
-		HTML:    `<p>Your email alerts are configured correctly!</p><p style="font-size:12px;color:#999;">Sent by Koin Ping</p>`,
+func buildEmailBody(message string, meta AlertMetadata) string {
+	txSection := ""
+	if meta.TxHash != "" {
+		txSection = fmt.Sprintf(
+			`<tr><td style="padding:8px 0;color:#666">Transaction</td>`+
+				`<td style="padding:8px 0"><a href="https://etherscan.io/tx/%s" style="color:#4f46e5">View on Etherscan</a></td></tr>`,
+			meta.TxHash,
+		)
 	}

-	body, err := json.Marshal(payload)
-	if err != nil {
-		return false, err
+	return fmt.Sprintf(`<!DOCTYPE html>
+<html>
+<body style="margin:0;padding:0;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;background:#f5f5f5">
+  <div style="max-width:560px;margin:24px auto;background:#fff;border-radius:8px;overflow:hidden;box-shadow:0 1px 3px rgba(0,0,0,.1)">
+    <div style="background:#4f46e5;padding:20px 24px">
+      <h1 style="margin:0;color:#fff;font-size:18px">Koin Ping Alert</h1>
+    </div>
+    <div style="padding:24px">
+      <p style="margin:0 0 16px;font-size:15px;color:#333">%s</p>
+      <table style="width:100%%;border-collapse:collapse;font-size:14px">
+        <tr><td style="padding:8px 0;color:#666">Address</td><td style="padding:8px 0">%s</td></tr>
+        <tr><td style="padding:8px 0;color:#666">Blockchain Address</td><td style="padding:8px 0;font-family:monospace;font-size:12px">%s</td></tr>
+        %s
+      </table>
+    </div>
+    <div style="padding:16px 24px;background:#fafafa;font-size:12px;color:#999;text-align:center">
+      Sent by Koin Ping
+    </div>
+  </div>
+</body>
+</html>`, message, meta.AddressLabel, meta.Address, txSection)
 }

-	req, err := http.NewRequest(http.MethodPost, "https://api.resend.com/emails", bytes.NewReader(body))
-	if err != nil {
-		return false, err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", "Bearer "+apiKey)
-
-	resp, err := emailHTTPClient.Do(req)
-	if err != nil {
-		log.Printf("Email test failed: %v", err)
-		return false, err
-	}
-	defer resp.Body.Close()
-
-	return resp.StatusCode >= 200 && resp.StatusCode < 300, nil
-}
-
-func alertTypeLabel(alertType string) string {
+func humanAlertType(alertType string) string {
 	switch alertType {
 	case "incoming_tx":
 		return "Incoming Transaction"
--- a/backend-go/internal/notifications/email_test.go
+++ b/backend-go/internal/notifications/email_test.go
@@ -0,0 +1,102 @@
+package notifications
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestSMTPConfig_IsConfigured(t *testing.T) {
+	tests := []struct {
+		name string
+		cfg  SMTPConfig
+		want bool
+	}{
+		{"fully configured", SMTPConfig{Host: "smtp.example.com", Port: 587, From: "noreply@example.com"}, true},
+		{"missing host", SMTPConfig{Port: 587, From: "noreply@example.com"}, false},
+		{"missing from", SMTPConfig{Host: "smtp.example.com", Port: 587}, false},
+		{"empty", SMTPConfig{}, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := tt.cfg.IsConfigured(); got != tt.want {
+				t.Errorf("IsConfigured() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestSMTPConfig_Addr(t *testing.T) {
+	cfg := SMTPConfig{Host: "smtp.example.com", Port: 587}
+	if got := cfg.addr(); got != "smtp.example.com:587" {
+		t.Errorf("addr() = %q, want %q", got, "smtp.example.com:587")
+	}
+}
+
+func TestBuildEmailBody(t *testing.T) {
+	meta := AlertMetadata{
+		TxHash:       "0xabc123",
+		AddressLabel: "Treasury",
+		AlertType:    "incoming_tx",
+		Address:      "0x1234567890abcdef1234567890abcdef12345678",
+	}
+
+	body := buildEmailBody("Incoming transaction: 5.5 ETH received", meta)
+
+	if !strings.Contains(body, "Koin Ping Alert") {
+		t.Error("body should contain title")
+	}
+	if !strings.Contains(body, "Incoming transaction: 5.5 ETH received") {
+		t.Error("body should contain message")
+	}
+	if !strings.Contains(body, "Treasury") {
+		t.Error("body should contain address label")
+	}
+	if !strings.Contains(body, "0x1234567890abcdef") {
+		t.Error("body should contain blockchain address")
+	}
+	if !strings.Contains(body, "etherscan.io/tx/0xabc123") {
+		t.Error("body should contain etherscan link")
+	}
+}
+
+func TestBuildEmailBody_NoTxHash(t *testing.T) {
+	meta := AlertMetadata{
+		AddressLabel: "Cold Storage",
+		AlertType:    "balance_below",
+		Address:      "0xabcdef",
+	}
+
+	body := buildEmailBody("Balance dropped below threshold", meta)
+
+	if strings.Contains(body, "etherscan.io") {
+		t.Error("body should not contain etherscan link when no tx hash")
+	}
+}
+
+func TestHumanAlertType(t *testing.T) {
+	tests := map[string]string{
+		"incoming_tx":    "Incoming Transaction",
+		"outgoing_tx":    "Outgoing Transaction",
+		"large_transfer": "Large Transfer",
+		"balance_below":  "Balance Below Threshold",
+		"unknown":        "Alert",
+		"test":           "Alert",
+	}
+	for alertType, want := range tests {
+		if got := humanAlertType(alertType); got != want {
+			t.Errorf("humanAlertType(%q) = %q, want %q", alertType, got, want)
+		}
+	}
+}
+
+func TestSendEmailNotification_NotConfigured(t *testing.T) {
+	cfg := SMTPConfig{}
+	sent, err := SendEmailNotification(cfg, "user@example.com", "test", AlertMetadata{})
+	if err == nil {
+		t.Fatal("expected error for unconfigured SMTP")
+	}
+	if sent {
+		t.Fatal("expected sent to be false")
+	}
+}
--- a/backend-go/internal/notifications/notifier.go
+++ b/backend-go/internal/notifications/notifier.go
@@ -1,16 +0,0 @@
-package notifications
-
-import "context"
-
-// AlertMetadata holds context about the alert being sent.
-type AlertMetadata struct {
-	TxHash       string
-	AddressLabel string
-	AlertType    string
-	Address      string
-}
-
-// Notifier is the interface implemented by all notification channels.
-type Notifier interface {
-	Send(ctx context.Context, message string, meta AlertMetadata) error
-}
--- a/backend-go/internal/notifications/slack.go
+++ b/backend-go/internal/notifications/slack.go
@@ -2,7 +2,6 @@ package notifications

 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -10,76 +9,67 @@ import (
 	"time"
 )

-// SlackNotifier sends alert notifications via a Slack webhook.
-type SlackNotifier struct {
-	WebhookURL string
+type slackBlock struct {
+	Type     string      `json:"type"`
+	Text     *slackText  `json:"text,omitempty"`
+	Fields   []slackText `json:"fields,omitempty"`
+	Elements []slackText `json:"elements,omitempty"`
 }

-// Send implements Notifier for Slack.
-func (s *SlackNotifier) Send(_ context.Context, message string, meta AlertMetadata) error {
-	_, err := SendSlackNotification(s.WebhookURL, message, meta)
-	return err
-}
-
-const slackHTTPTimeoutSeconds = 10
-
-var slackHTTPClient = &http.Client{ //nolint:gochecknoglobals
-	Timeout: slackHTTPTimeoutSeconds * time.Second,
-}
-
-type slackAttachment struct {
-	Color  string        `json:"color"`
-	Title  string        `json:"title"`
+type slackText struct {
+	Type string `json:"type"`
 	Text string `json:"text"`
-	Fields []slackField  `json:"fields"`
-	Footer string        `json:"footer"`
-	Ts     int64         `json:"ts"`
-}
-
-type slackField struct {
-	Title string `json:"title"`
-	Value string `json:"value"`
-	Short bool   `json:"short"`
 }

 type slackPayload struct {
-	Text        string            `json:"text,omitempty"`
-	Attachments []slackAttachment `json:"attachments,omitempty"`
+	Blocks []slackBlock `json:"blocks"`
 }

 func SendSlackNotification(webhookURL, message string, meta AlertMetadata) (bool, error) {
-	fields := []slackField{
-		{Title: "Address", Value: meta.AddressLabel, Short: true},
-		{Title: "Blockchain Address", Value: fmt.Sprintf("`%s`", meta.Address), Short: false},
+	etherscanLink := ""
+	if meta.TxHash != "" {
+		etherscanLink = fmt.Sprintf("<%s|View on Etherscan>", "https://etherscan.io/tx/"+meta.TxHash)
 	}

-	if meta.TxHash != "" {
-		fields = append(fields, slackField{
-			Title: "Transaction",
-			Value: fmt.Sprintf("<https://etherscan.io/tx/%s|View on Etherscan>", meta.TxHash),
-			Short: false,
+	blocks := []slackBlock{
+		{
+			Type: "header",
+			Text: &slackText{Type: "plain_text", Text: emojiForAlertType(meta.AlertType) + " Koin Ping Alert"},
+		},
+		{
+			Type: "section",
+			Text: &slackText{Type: "mrkdwn", Text: message},
+		},
+		{
+			Type: "section",
+			Fields: []slackText{
+				{Type: "mrkdwn", Text: fmt.Sprintf("*Address:*\n%s", meta.AddressLabel)},
+				{Type: "mrkdwn", Text: fmt.Sprintf("*Blockchain Address:*\n`%s`", meta.Address)},
+			},
+		},
+	}
+
+	if etherscanLink != "" {
+		blocks = append(blocks, slackBlock{
+			Type: "section",
+			Text: &slackText{Type: "mrkdwn", Text: fmt.Sprintf("*Transaction:* %s", etherscanLink)},
 		})
 	}

-	payload := slackPayload{
-		Attachments: []slackAttachment{
-			{
-				Color:  slackColorForAlertType(meta.AlertType),
-				Title:  "Koin Ping Alert",
-				Text:   message,
-				Fields: fields,
-				Footer: "Koin Ping",
-				Ts:     time.Now().Unix(),
+	blocks = append(blocks, slackBlock{
+		Type: "context",
+		Elements: []slackText{
+			{Type: "mrkdwn", Text: fmt.Sprintf("Koin Ping | %s", time.Now().UTC().Format(time.RFC3339))},
 		},
-		},
-	}
+	})

+	payload := slackPayload{Blocks: blocks}
 	body, err := json.Marshal(payload)
 	if err != nil {
 		return false, fmt.Errorf("marshal slack payload: %w", err)
 	}

-	resp, err := slackHTTPClient.Post(webhookURL, "application/json", bytes.NewReader(body))
+	resp, err := http.Post(webhookURL, "application/json", bytes.NewReader(body))
 	if err != nil {
 		log.Printf("Failed to send Slack notification: %v", err)
 		return false, err
@@ -96,7 +86,15 @@ func SendSlackNotification(webhookURL, message string, meta AlertMetadata) (bool

 func TestSlackWebhook(webhookURL string) (bool, error) {
 	payload := slackPayload{
-		Text: "Koin Ping test notification — Your Slack alerts are configured correctly!",
+		Blocks: []slackBlock{
+			{
+				Type: "section",
+				Text: &slackText{
+					Type: "mrkdwn",
+					Text: "Koin Ping test notification — Your Slack webhook is configured correctly!",
+				},
+			},
+		},
 	}

 	body, err := json.Marshal(payload)
@@ -104,7 +102,7 @@ func TestSlackWebhook(webhookURL string) (bool, error) {
 		return false, err
 	}

-	resp, err := slackHTTPClient.Post(webhookURL, "application/json", bytes.NewReader(body))
+	resp, err := http.Post(webhookURL, "application/json", bytes.NewReader(body))
 	if err != nil {
 		log.Printf("Slack webhook test failed: %v", err)
 		return false, err
@@ -114,15 +112,17 @@ func TestSlackWebhook(webhookURL string) (bool, error) {
 	return resp.StatusCode >= 200 && resp.StatusCode < 300, nil
 }

-func slackColorForAlertType(alertType string) string {
+func emojiForAlertType(alertType string) string {
 	switch alertType {
 	case "incoming_tx":
-		return "#00ff00"
+		return "📥"
 	case "outgoing_tx":
-		return "#ff9900"
-	case "large_transfer", "balance_below":
-		return "#ff0000"
+		return "📤"
+	case "large_transfer":
+		return "🚨"
+	case "balance_below":
+		return "⚠️"
 	default:
-		return "#0099ff"
+		return "🔔"
 	}
 }
--- a/backend-go/internal/notifications/slack_test.go
+++ b/backend-go/internal/notifications/slack_test.go
@@ -0,0 +1,128 @@
+package notifications
+
+import (
+	"encoding/json"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestSendSlackNotification(t *testing.T) {
+	var receivedPayload slackPayload
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPost {
+			t.Errorf("expected POST, got %s", r.Method)
+		}
+		if r.Header.Get("Content-Type") != "application/json" {
+			t.Errorf("expected application/json content type")
+		}
+
+		body, _ := io.ReadAll(r.Body)
+		json.Unmarshal(body, &receivedPayload)
+
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer server.Close()
+
+	meta := AlertMetadata{
+		TxHash:       "0xabc123",
+		AddressLabel: "Treasury",
+		AlertType:    "incoming_tx",
+		Address:      "0x1234567890abcdef1234567890abcdef12345678",
+	}
+
+	sent, err := SendSlackNotification(server.URL, "Incoming transaction: 5.5 ETH received", meta)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !sent {
+		t.Fatal("expected sent to be true")
+	}
+
+	if len(receivedPayload.Blocks) < 3 {
+		t.Fatalf("expected at least 3 blocks, got %d", len(receivedPayload.Blocks))
+	}
+	if receivedPayload.Blocks[0].Type != "header" {
+		t.Errorf("first block should be header, got %s", receivedPayload.Blocks[0].Type)
+	}
+}
+
+func TestSendSlackNotification_ServerError(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusInternalServerError)
+	}))
+	defer server.Close()
+
+	sent, err := SendSlackNotification(server.URL, "test", AlertMetadata{})
+	if err == nil {
+		t.Fatal("expected error for server error response")
+	}
+	if sent {
+		t.Fatal("expected sent to be false")
+	}
+}
+
+func TestSendSlackNotification_NoTxHash(t *testing.T) {
+	var receivedPayload slackPayload
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		body, _ := io.ReadAll(r.Body)
+		json.Unmarshal(body, &receivedPayload)
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer server.Close()
+
+	meta := AlertMetadata{
+		AddressLabel: "Treasury",
+		AlertType:    "balance_below",
+		Address:      "0x1234567890abcdef1234567890abcdef12345678",
+	}
+
+	sent, err := SendSlackNotification(server.URL, "Balance dropped below threshold", meta)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !sent {
+		t.Fatal("expected sent to be true")
+	}
+
+	for _, block := range receivedPayload.Blocks {
+		if block.Text != nil && block.Type == "section" {
+			if block.Text.Text == "*Transaction:*" {
+				t.Error("should not include transaction block when TxHash is empty")
+			}
+		}
+	}
+}
+
+func TestTestSlackWebhook(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer server.Close()
+
+	ok, err := TestSlackWebhook(server.URL)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Fatal("expected ok to be true")
+	}
+}
+
+func TestEmojiForAlertType(t *testing.T) {
+	tests := map[string]string{
+		"incoming_tx":    "📥",
+		"outgoing_tx":    "📤",
+		"large_transfer": "🚨",
+		"balance_below":  "⚠️",
+		"unknown":        "🔔",
+	}
+	for alertType, want := range tests {
+		if got := emojiForAlertType(alertType); got != want {
+			t.Errorf("emojiForAlertType(%q) = %q, want %q", alertType, got, want)
+		}
+	}
+}
--- a/backend-go/internal/notifications/telegram.go
+++ b/backend-go/internal/notifications/telegram.go
@@ -1,122 +0,0 @@
-package notifications
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-	"time"
-)
-
-// TelegramNotifier sends alert notifications via Telegram.
-type TelegramNotifier struct {
-	BotToken string
-	ChatID   string
-}
-
-// Send implements Notifier for Telegram.
-func (t *TelegramNotifier) Send(_ context.Context, message string, meta AlertMetadata) error {
-	_, err := SendTelegramNotification(t.BotToken, t.ChatID, message, meta)
-	return err
-}
-
-const telegramHTTPTimeoutSeconds = 10
-
-var telegramHTTPClient = &http.Client{ //nolint:gochecknoglobals
-	Timeout: telegramHTTPTimeoutSeconds * time.Second,
-}
-
-type telegramPayload struct {
-	ChatID    string `json:"chat_id"`
-	Text      string `json:"text"`
-	ParseMode string `json:"parse_mode"`
-}
-
-func SendTelegramNotification(botToken, chatID, message string, meta AlertMetadata) (bool, error) {
-	text := fmt.Sprintf("*Koin Ping Alert*\n\n%s\n\n*Address:* %s\n`%s`",
-		escapeMarkdown(message), escapeMarkdown(meta.AddressLabel), meta.Address)
-
-	if meta.TxHash != "" {
-		text += fmt.Sprintf("\n\n[View on Etherscan](https://etherscan.io/tx/%s)", meta.TxHash)
-	}
-
-	payload := telegramPayload{
-		ChatID:    chatID,
-		Text:      text,
-		ParseMode: "Markdown",
-	}
-
-	body, err := json.Marshal(payload)
-	if err != nil {
-		return false, fmt.Errorf("marshal telegram payload: %w", err)
-	}
-
-	url := fmt.Sprintf("https://api.telegram.org/bot%s/sendMessage", botToken)
-
-	resp, err := telegramHTTPClient.Post(url, "application/json", bytes.NewReader(body))
-	if err != nil {
-		log.Printf("Failed to send Telegram notification: %v", err)
-		return false, err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		log.Printf("Telegram API failed: HTTP %d", resp.StatusCode)
-		return false, fmt.Errorf("telegram API failed: HTTP %d", resp.StatusCode)
-	}
-
-	return true, nil
-}
-
-func TestTelegramWebhook(botToken, chatID string) (bool, error) {
-	payload := telegramPayload{
-		ChatID:    chatID,
-		Text:      "Koin Ping test notification — Your Telegram alerts are configured correctly!",
-		ParseMode: "Markdown",
-	}
-
-	body, err := json.Marshal(payload)
-	if err != nil {
-		return false, err
-	}
-
-	url := fmt.Sprintf("https://api.telegram.org/bot%s/sendMessage", botToken)
-
-	resp, err := telegramHTTPClient.Post(url, "application/json", bytes.NewReader(body))
-	if err != nil {
-		log.Printf("Telegram test failed: %v", err)
-		return false, err
-	}
-	defer resp.Body.Close()
-
-	return resp.StatusCode >= 200 && resp.StatusCode < 300, nil
-}
-
-func escapeMarkdown(s string) string {
-	replacer := []struct{ old, new string }{
-		{"_", "\\_"}, {"*", "\\*"}, {"[", "\\["}, {"]", "\\]"},
-		{"(", "\\("}, {")", "\\)"}, {"~", "\\~"}, {"`", "\\`"},
-		{">", "\\>"}, {"#", "\\#"}, {"+", "\\+"}, {"-", "\\-"},
-		{"=", "\\="}, {"|", "\\|"}, {"{", "\\{"}, {"}", "\\}"},
-		{".", "\\."}, {"!", "\\!"},
-	}
-	result := s
-	for _, r := range replacer {
-		result = replaceAll(result, r.old, r.new)
-	}
-	return result
-}
-
-func replaceAll(s, old, new string) string {
-	out := ""
-	for i := 0; i < len(s); i++ {
-		if string(s[i]) == old {
-			out += new
-		} else {
-			out += string(s[i])
-		}
-	}
-	return out
-}
--- a/backend-go/internal/protocols/ethereum/jsonrpc.go
+++ b/backend-go/internal/protocols/ethereum/jsonrpc.go
@@ -4,9 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"log"
 	"math/big"
 	"net/http"
 	"strings"
@@ -15,11 +13,7 @@ import (
 	"github.com/kjannette/koin-ping/backend-go/internal/domain"
 )

-const (
-	rpcTimeoutMS    = 30000
-	rpcMaxRetries   = 3
-	rpcRetryBaseMS  = 1000
-)
+const rpcTimeoutMS = 30000

 type JsonRpcEthereum struct {
 	rpcURL string
@@ -72,44 +66,6 @@ func (j *JsonRpcEthereum) callRPC(ctx context.Context, method string, params ...
 		return nil, fmt.Errorf("marshal RPC request: %w", err)
 	}

-	return j.callWithRetry(ctx, method, body)
-}
-
-// callWithRetry executes a JSON-RPC POST with exponential backoff on transient errors.
-// It retries on network errors, HTTP 429, and HTTP 5xx. It does NOT retry on RPC-level
-// errors or other 4xx responses (those are permanent failures).
-func (j *JsonRpcEthereum) callWithRetry(ctx context.Context, method string, body []byte) (json.RawMessage, error) {
-	var lastErr error
-	for attempt := range rpcMaxRetries {
-		if attempt > 0 {
-			wait := time.Duration(rpcRetryBaseMS*(1<<(attempt-1))) * time.Millisecond
-			select {
-			case <-ctx.Done():
-				return nil, ctx.Err()
-			case <-time.After(wait):
-			}
-			log.Printf("Retrying RPC call [%s] (attempt %d/%d)", method, attempt+1, rpcMaxRetries)
-		}
-
-		result, err := j.doRPCCall(ctx, method, body)
-		if err == nil {
-			return result, nil
-		}
-
-		lastErr = err
-
-		// Permanent errors: do not retry
-		if isPermanentRPCError(err) {
-			return nil, err
-		}
-
-		log.Printf("Transient RPC error [%s] (attempt %d/%d): %v", method, attempt+1, rpcMaxRetries, err)
-	}
-
-	return nil, lastErr
-}
-
-func (j *JsonRpcEthereum) doRPCCall(ctx context.Context, method string, body []byte) (json.RawMessage, error) {
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, j.rpcURL, bytes.NewReader(body))
 	if err != nil {
 		return nil, fmt.Errorf("create RPC request: %w", err)
@@ -122,13 +78,8 @@ func (j *JsonRpcEthereum) doRPCCall(ctx context.Context, method string, body []b
 	}
 	defer resp.Body.Close()

-	// 429 and 5xx are transient; other non-200 are permanent.
 	if resp.StatusCode != http.StatusOK {
-		err := fmt.Errorf("HTTP %d: %s for %s", resp.StatusCode, resp.Status, method)
-		if resp.StatusCode == http.StatusTooManyRequests || resp.StatusCode >= 500 { //nolint:mnd
-			return nil, err // transient — will be retried
-		}
-		return nil, &permanentRPCError{err}
+		return nil, fmt.Errorf("HTTP %d: %s for %s", resp.StatusCode, resp.Status, method)
 	}

 	var rpcResp rpcResponse
@@ -137,25 +88,12 @@ func (j *JsonRpcEthereum) doRPCCall(ctx context.Context, method string, body []b
 	}

 	if rpcResp.Error != nil {
-		// RPC-level errors are permanent (bad params, unsupported method, etc.)
-		return nil, &permanentRPCError{
-			fmt.Errorf("RPC Error [%s]: %s (code: %d)", method, rpcResp.Error.Message, rpcResp.Error.Code),
-		}
+		return nil, fmt.Errorf("RPC Error [%s]: %s (code: %d)", method, rpcResp.Error.Message, rpcResp.Error.Code)
 	}

 	return rpcResp.Result, nil
 }

-type permanentRPCError struct{ cause error }
-
-func (e *permanentRPCError) Error() string { return e.cause.Error() }
-func (e *permanentRPCError) Unwrap() error { return e.cause }
-
-func isPermanentRPCError(err error) bool {
-	var p *permanentRPCError
-	return errors.As(err, &p)
-}
-
 func (j *JsonRpcEthereum) GetLatestBlockNumber(ctx context.Context) (int, error) {
 	result, err := j.callRPC(ctx, "eth_blockNumber")
 	if err != nil {
@@ -242,132 +180,6 @@ func (j *JsonRpcEthereum) GetBalance(ctx context.Context, address string) (strin
 	return hexToDecimalString(hexBalance), nil
 }

-const erc20TransferTopic = "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
-
-const minTransferTopics = 3
-
-type rpcLog struct {
-	Address     string   `json:"address"`
-	Topics      []string `json:"topics"`
-	Data        string   `json:"data"`
-	BlockNumber string   `json:"blockNumber"`
-	TxHash      string   `json:"transactionHash"`
-}
-
-// GetTokenTransfers fetches ERC-20 Transfer events for a given address
-// across a block range, covering both incoming and outgoing transfers.
-func (j *JsonRpcEthereum) GetTokenTransfers(ctx context.Context, fromBlock, toBlock int, address string) ([]domain.NormalizedTx, error) {
-	paddedAddr := padAddress(address)
-	hexFrom := fmt.Sprintf("0x%x", fromBlock)
-	hexTo := fmt.Sprintf("0x%x", toBlock)
-
-	incomingLogs, err := j.getTransferLogs(ctx, hexFrom, hexTo, "", paddedAddr)
-	if err != nil {
-		return nil, fmt.Errorf("fetch incoming token transfers: %w", err)
-	}
-
-	outgoingLogs, err := j.getTransferLogs(ctx, hexFrom, hexTo, paddedAddr, "")
-	if err != nil {
-		return nil, fmt.Errorf("fetch outgoing token transfers: %w", err)
-	}
-
-	seen := make(map[string]bool)
-	var txs []domain.NormalizedTx
-
-	for _, entry := range append(incomingLogs, outgoingLogs...) {
-		key := entry.TxHash + "|" + entry.Address + "|" + entry.Data
-		if seen[key] {
-			continue
-		}
-		seen[key] = true
-
-		tx, parseErr := parseTransferLog(entry)
-		if parseErr != nil {
-			log.Printf("Skipping unparseable transfer log in tx %s: %v", entry.TxHash, parseErr)
-			continue
-		}
-		txs = append(txs, tx)
-	}
-
-	return txs, nil
-}
-
-func (j *JsonRpcEthereum) getTransferLogs(ctx context.Context, fromBlock, toBlock, fromAddr, toAddr string) ([]rpcLog, error) {
-	topics := make([]interface{}, minTransferTopics)
-	topics[0] = erc20TransferTopic
-
-	if fromAddr != "" {
-		topics[1] = fromAddr
-	}
-	if toAddr != "" {
-		topics[2] = toAddr
-	}
-
-	filter := map[string]interface{}{
-		"fromBlock": fromBlock,
-		"toBlock":   toBlock,
-		"topics":    topics,
-	}
-
-	result, err := j.callRPC(ctx, "eth_getLogs", filter)
-	if err != nil {
-		return nil, err
-	}
-
-	var logs []rpcLog
-	if err := json.Unmarshal(result, &logs); err != nil {
-		return nil, fmt.Errorf("unmarshal logs: %w", err)
-	}
-
-	return logs, nil
-}
-
-func parseTransferLog(entry rpcLog) (domain.NormalizedTx, error) {
-	if len(entry.Topics) < minTransferTopics {
-		return domain.NormalizedTx{}, fmt.Errorf("transfer log has %d topics, expected >= 3", len(entry.Topics))
-	}
-
-	from := topicToAddress(entry.Topics[1])
-	to := topicToAddress(entry.Topics[2])
-	tokenValue := hexToDecimalString(entry.Data)
-	blockNumber, _ := hexToInt(entry.BlockNumber)
-
-	contractAddr := strings.ToLower(entry.Address)
-	tokenInfo, known := LookupToken(contractAddr)
-
-	tx := domain.NormalizedTx{
-		Hash:          entry.TxHash,
-		From:          from,
-		To:            &to,
-		Value:         "0",
-		BlockNumber:   blockNumber,
-		TokenContract: &contractAddr,
-		TokenValue:    &tokenValue,
-	}
-
-	if known {
-		tx.TokenSymbol = &tokenInfo.Symbol
-		tx.TokenDecimals = &tokenInfo.Decimals
-	}
-
-	return tx, nil
-}
-
-func padAddress(addr string) string {
-	clean := strings.TrimPrefix(strings.ToLower(addr), "0x")
-	const addressHexLen = 64
-	return "0x" + strings.Repeat("0", addressHexLen-len(clean)) + clean
-}
-
-func topicToAddress(topic string) string {
-	clean := strings.TrimPrefix(topic, "0x")
-	const ethAddrLen = 40
-	if len(clean) > ethAddrLen {
-		clean = clean[len(clean)-ethAddrLen:]
-	}
-	return "0x" + strings.ToLower(clean)
-}
-
 func hexToInt(hex string) (int, error) {
 	hex = strings.TrimPrefix(hex, "0x")
 	n, ok := new(big.Int).SetString(hex, 16)
--- a/backend-go/internal/protocols/ethereum/jsonrpc_test.go
+++ b/backend-go/internal/protocols/ethereum/jsonrpc_test.go
@@ -0,0 +1,96 @@
+package ethereum
+
+import (
+	"math/big"
+	"testing"
+)
+
+func TestHexToInt(t *testing.T) {
+	tests := []struct {
+		hex  string
+		want int
+	}{
+		{"0x0", 0},
+		{"0x1", 1},
+		{"0xa", 10},
+		{"0xff", 255},
+		{"0x100", 256},
+		{"0x1234", 4660},
+	}
+
+	for _, tt := range tests {
+		got, err := hexToInt(tt.hex)
+		if err != nil {
+			t.Fatalf("hexToInt(%q) error: %v", tt.hex, err)
+		}
+		if got != tt.want {
+			t.Errorf("hexToInt(%q) = %d, want %d", tt.hex, got, tt.want)
+		}
+	}
+}
+
+func TestHexToInt_Invalid(t *testing.T) {
+	_, err := hexToInt("xyz")
+	if err == nil {
+		t.Fatal("expected error for invalid hex")
+	}
+}
+
+func TestHexToInt64(t *testing.T) {
+	got, err := hexToInt64("0x5f5e100")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if got != 100000000 {
+		t.Errorf("got %d, want 100000000", got)
+	}
+}
+
+func TestHexToDecimalString(t *testing.T) {
+	tests := []struct {
+		hex  string
+		want string
+	}{
+		{"0x0", "0"},
+		{"0x", "0"},
+		{"", "0"},
+		{"0x1", "1"},
+		{"0xde0b6b3a7640000", "1000000000000000000"},
+	}
+
+	for _, tt := range tests {
+		got := hexToDecimalString(tt.hex)
+		if got != tt.want {
+			t.Errorf("hexToDecimalString(%q) = %q, want %q", tt.hex, got, tt.want)
+		}
+	}
+}
+
+func TestHexToDecimalString_LargeValues(t *testing.T) {
+	expected := new(big.Int).Mul(
+		big.NewInt(100),
+		new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil),
+	)
+	hex := "0x" + expected.Text(16)
+	got := hexToDecimalString(hex)
+	if got != expected.String() {
+		t.Errorf("got %q, want %q", got, expected.String())
+	}
+}
+
+func TestNewJsonRpcEthereum_EmptyURL(t *testing.T) {
+	_, err := NewJsonRpcEthereum("")
+	if err == nil {
+		t.Fatal("expected error for empty URL")
+	}
+}
+
+func TestNewJsonRpcEthereum_ValidURL(t *testing.T) {
+	eth, err := NewJsonRpcEthereum("https://example.com/rpc")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if eth == nil {
+		t.Fatal("expected non-nil client")
+	}
+}
--- a/backend-go/internal/protocols/ethereum/observer.go
+++ b/backend-go/internal/protocols/ethereum/observer.go
@@ -12,5 +12,4 @@ type EthereumObserver interface {
 	GetLatestBlockNumber(ctx context.Context) (int, error)
 	GetBlockTransactions(ctx context.Context, blockNumber int) ([]domain.NormalizedTx, error)
 	GetBalance(ctx context.Context, address string) (string, error)
-	GetTokenTransfers(ctx context.Context, fromBlock, toBlock int, address string) ([]domain.NormalizedTx, error)
 }
--- a/backend-go/internal/protocols/ethereum/tokens.go
+++ b/backend-go/internal/protocols/ethereum/tokens.go
@@ -1,34 +0,0 @@
-package ethereum
-
-import "strings"
-
-// TokenInfo holds metadata for a known ERC-20 token contract.
-type TokenInfo struct {
-	Symbol   string
-	Decimals int
-}
-
-//nolint:gochecknoglobals
-var wellKnownTokens = map[string]TokenInfo{
-	"0xdac17f958d2ee523a2206206994597c13d831ec7": {Symbol: "USDT", Decimals: 6},
-	"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48": {Symbol: "USDC", Decimals: 6},
-	"0x6b175474e89094c44da98b954eedeac495271d0f": {Symbol: "DAI", Decimals: 18},
-	"0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2": {Symbol: "WETH", Decimals: 18},
-	"0x2260fac5e5542a773aa44fbcfedf7c193bc2c599": {Symbol: "WBTC", Decimals: 8},
-	"0x514910771af9ca656af840dff83e8264ecf986ca": {Symbol: "LINK", Decimals: 18},
-	"0x1f9840a85d5af5bf1d1762f925bdaddc4201f984": {Symbol: "UNI", Decimals: 18},
-	"0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9": {Symbol: "AAVE", Decimals: 18},
-	"0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce": {Symbol: "SHIB", Decimals: 18},
-	"0x6982508145454ce325ddbe47a25d4ec3d2311933": {Symbol: "PEPE", Decimals: 18},
-	"0xb8c77482e45f1f44de1745f52c74426c631bdd52": {Symbol: "BNB", Decimals: 18},
-	"0x4fabb145d64652a948d72533023f6e7a623c7c53": {Symbol: "BUSD", Decimals: 18},
-	"0x75231f58b43240c9718dd58b4967c5114342a86c": {Symbol: "OKB", Decimals: 18},
-	"0x582d872a1b094fc48f5de31d3b73f2d9be47def1": {Symbol: "TON", Decimals: 9},
-	"0x4d224452801aced8b2f0aebe155379bb5d594381": {Symbol: "APE", Decimals: 18},
-}
-
-// LookupToken returns metadata for a known token contract, if found.
-func LookupToken(contractAddress string) (TokenInfo, bool) {
-	info, ok := wellKnownTokens[strings.ToLower(contractAddress)]
-	return info, ok
-}
--- a/backend-go/internal/services/email_digest.go
+++ b/backend-go/internal/services/email_digest.go
@@ -1,199 +0,0 @@
-package services
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-	"time"
-
-	"github.com/kjannette/koin-ping/backend-go/internal/models"
-)
-
-const (
-	resendAPIURL          = "https://api.resend.com/emails"
-	emailHTTPTimeout      = 10 * time.Second
-	defaultDigestMaxItems = 50
-)
-
-var digestHTTPClient = &http.Client{Timeout: emailHTTPTimeout} //nolint:gochecknoglobals
-
-// EmailDigestService handles email setup and digest sending via Resend.
-type EmailDigestService struct {
-	apiKey      string
-	fromAddress string
-	alertEvents *models.AlertEventModel
-	notifCfgs   *models.NotificationConfigModel
-}
-
-func NewEmailDigestService(
-	apiKey, fromAddress string,
-	alertEvents *models.AlertEventModel,
-	notifCfgs *models.NotificationConfigModel,
-) *EmailDigestService {
-	return &EmailDigestService{
-		apiKey:      apiKey,
-		fromAddress: fromAddress,
-		alertEvents: alertEvents,
-		notifCfgs:   notifCfgs,
-	}
-}
-
-// Configured returns true when the Resend API key is present.
-func (s *EmailDigestService) Configured() bool {
-	return s.apiKey != ""
-}
-
-// SetupEmail validates the email works by sending a welcome/confirmation
-// message via Resend. Called when a user saves their email in notification settings.
-func (s *EmailDigestService) SetupEmail(toAddress string) error {
-	if !s.Configured() {
-		return fmt.Errorf("email service not configured: RESEND_API_KEY not set") //nolint:err113
-	}
-
-	html := `
-<div style="font-family: sans-serif; max-width: 600px; margin: 0 auto;">
-  <h2 style="color: #333;">Welcome to Koin Ping Email Alerts</h2>
-  <p>Your email has been successfully configured for alert notifications.</p>
-  <p>You will receive alert digests at this address when events are triggered
-     on your watched addresses.</p>
-  <hr style="border: none; border-top: 1px solid #eee; margin: 24px 0;" />
-  <p style="font-size: 12px; color: #999;">Sent by Koin Ping</p>
-</div>`
-
-	return s.send(toAddress, "Koin Ping — Email Alerts Configured", html)
-}
-
-// SendDigest compiles recent alert events for a user and sends a digest email.
-func (s *EmailDigestService) SendDigest(ctx context.Context, userID, toAddress string) error {
-	if !s.Configured() {
-		return fmt.Errorf("email service not configured: RESEND_API_KEY not set") //nolint:err113
-	}
-
-	events, err := s.alertEvents.ListRecentByUser(ctx, userID, defaultDigestMaxItems)
-	if err != nil {
-		return fmt.Errorf("fetch alert events: %w", err)
-	}
-
-	if len(events) == 0 {
-		log.Printf("No recent alerts for user %s — skipping digest", userID)
-		return nil
-	}
-
-	var rows string
-	for _, e := range events {
-		label := "—"
-		if e.AddressLabel != nil {
-			label = *e.AddressLabel
-		}
-		txLink := "—"
-		if e.TxHash != nil {
-			txLink = fmt.Sprintf(
-				`<a href="https://etherscan.io/tx/%s" style="color:#0066cc;">%s…</a>`,
-				*e.TxHash, (*e.TxHash)[:10],
-			)
-		}
-		rows += fmt.Sprintf(`
-      <tr>
-        <td style="padding:6px 8px; border-bottom:1px solid #eee;">%s</td>
-        <td style="padding:6px 8px; border-bottom:1px solid #eee;">%s</td>
-        <td style="padding:6px 8px; border-bottom:1px solid #eee;">%s</td>
-        <td style="padding:6px 8px; border-bottom:1px solid #eee; font-size:12px; color:#666;">%s</td>
-      </tr>`,
-			label, e.Message, txLink,
-			e.Timestamp.Format("Jan 2 15:04 UTC"),
-		)
-	}
-
-	html := fmt.Sprintf(`
-<div style="font-family: sans-serif; max-width: 700px; margin: 0 auto;">
-  <h2 style="color: #333;">Koin Ping — Alert Digest</h2>
-  <p>Here are your recent alerts (%d total):</p>
-  <table style="width:100%%; border-collapse:collapse; font-size:14px;">
-    <thead>
-      <tr style="background:#f5f5f5;">
-        <th style="padding:8px; text-align:left;">Address</th>
-        <th style="padding:8px; text-align:left;">Alert</th>
-        <th style="padding:8px; text-align:left;">Tx</th>
-        <th style="padding:8px; text-align:left;">Time</th>
-      </tr>
-    </thead>
-    <tbody>%s</tbody>
-  </table>
-  <hr style="border:none; border-top:1px solid #eee; margin:24px 0;" />
-  <p style="font-size:12px; color:#999;">Sent by Koin Ping</p>
-</div>`, len(events), rows)
-
-	subject := fmt.Sprintf("Koin Ping Digest — %d alerts", len(events))
-
-	return s.send(toAddress, subject, html)
-}
-
-// SendDigestsForAllUsers sends a digest email to every user that has
-// notifications enabled and an email configured.
-func (s *EmailDigestService) SendDigestsForAllUsers(ctx context.Context) (int, error) {
-	if !s.Configured() {
-		return 0, nil
-	}
-
-	configs, err := s.notifCfgs.ListEnabled(ctx)
-	if err != nil {
-		return 0, fmt.Errorf("list enabled configs: %w", err)
-	}
-
-	sent := 0
-	for _, cfg := range configs {
-		if cfg.Email == nil || *cfg.Email == "" {
-			continue
-		}
-		if err := s.SendDigest(ctx, cfg.UserID, *cfg.Email); err != nil {
-			log.Printf("Failed to send digest to user %s: %v", cfg.UserID, err)
-			continue
-		}
-		sent++
-	}
-
-	return sent, nil
-}
-
-type resendEmailPayload struct {
-	From    string `json:"from"`
-	To      string `json:"to"`
-	Subject string `json:"subject"`
-	HTML    string `json:"html"`
-}
-
-func (s *EmailDigestService) send(to, subject, html string) error {
-	payload := resendEmailPayload{
-		From:    s.fromAddress,
-		To:      to,
-		Subject: subject,
-		HTML:    html,
-	}
-
-	body, err := json.Marshal(payload)
-	if err != nil {
-		return fmt.Errorf("marshal email payload: %w", err)
-	}
-
-	req, err := http.NewRequest(http.MethodPost, resendAPIURL, bytes.NewReader(body))
-	if err != nil {
-		return fmt.Errorf("create request: %w", err)
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", "Bearer "+s.apiKey)
-
-	resp, err := digestHTTPClient.Do(req)
-	if err != nil {
-		return fmt.Errorf("send email via Resend: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return fmt.Errorf("Resend API returned HTTP %d", resp.StatusCode) //nolint:err113
-	}
-
-	return nil
-}
--- a/backend-go/internal/services/evaluator.go
+++ b/backend-go/internal/services/evaluator.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"time"

 	"github.com/kjannette/koin-ping/backend-go/internal/domain"
 	"github.com/kjannette/koin-ping/backend-go/internal/models"
@@ -13,20 +12,13 @@ import (
 	"github.com/kjannette/koin-ping/backend-go/internal/wei"
 )

-const (
-	notificationTimeout    = 30 * time.Second
-	notificationMaxRetries = 3
-	notificationRetryBase  = time.Second
-)
-
 type EvaluatorService struct {
 	eth          ethereum.EthereumObserver
 	alertRules   *models.AlertRuleModel
 	alertEvents  *models.AlertEventModel
 	addresses    *models.AddressModel
 	notifConfigs *models.NotificationConfigModel
-	resendAPIKey string
-	emailFrom    string
+	smtpConfig   notifications.SMTPConfig
 }

 func NewEvaluatorService(
@@ -35,8 +27,7 @@ func NewEvaluatorService(
 	alertEvents *models.AlertEventModel,
 	addresses *models.AddressModel,
 	notifConfigs *models.NotificationConfigModel,
-	resendAPIKey string,
-	emailFrom string,
+	smtpCfg notifications.SMTPConfig,
 ) *EvaluatorService {
 	return &EvaluatorService{
 		eth:          eth,
@@ -44,8 +35,7 @@ func NewEvaluatorService(
 		alertEvents:  alertEvents,
 		addresses:    addresses,
 		notifConfigs: notifConfigs,
-		resendAPIKey: resendAPIKey,
-		emailFrom:    emailFrom,
+		smtpConfig:   smtpCfg,
 	}
 }

@@ -174,86 +164,21 @@ func (s *EvaluatorService) fireAlert(ctx context.Context, rule domain.AlertRule,
 	message := s.buildMessage(rule, obs)
 	txHash := &obs.Hash

-	event, err := s.alertEvents.Create(ctx, rule.ID, message, &addressLabel, txHash)
+	_, err = s.alertEvents.Create(ctx, rule.ID, message, &addressLabel, txHash)
 	if err != nil {
 		return err
 	}

-	if event == nil {
-		log.Printf("[ALERT DEDUP] Rule %d (%s) - duplicate event skipped for TX: %s", rule.ID, rule.Type, obs.Hash)
-		return nil
-	}
-
 	log.Printf("[ALERT FIRED] Rule %d (%s) - %s - TX: %s", rule.ID, rule.Type, message, obs.Hash)

 	if addr != nil {
-		userID := addr.UserID
-		address := addr.Address
-		go func() {
-			notifCtx, cancel := context.WithTimeout(context.Background(), notificationTimeout)
-			defer cancel()
-			s.sendNotification(notifCtx, userID, message, obs, addressLabel, rule, address)
-		}()
+		go s.sendNotifications(ctx, addr.UserID, message, obs, addressLabel, rule, addr.Address)
 	}

 	return nil
 }

-func (s *EvaluatorService) buildNotifiers(cfg *domain.NotificationConfig) []notifications.Notifier {
-	var notifiers []notifications.Notifier
-
-	if cfg.DiscordWebhookURL != nil && *cfg.DiscordWebhookURL != "" {
-		notifiers = append(notifiers, &notifications.DiscordNotifier{WebhookURL: *cfg.DiscordWebhookURL})
-	}
-
-	if cfg.TelegramBotToken != nil && *cfg.TelegramBotToken != "" &&
-		cfg.TelegramChatID != nil && *cfg.TelegramChatID != "" {
-		notifiers = append(notifiers, &notifications.TelegramNotifier{
-			BotToken: *cfg.TelegramBotToken,
-			ChatID:   *cfg.TelegramChatID,
-		})
-	}
-
-	if cfg.SlackWebhookURL != nil && *cfg.SlackWebhookURL != "" {
-		notifiers = append(notifiers, &notifications.SlackNotifier{WebhookURL: *cfg.SlackWebhookURL})
-	}
-
-	if cfg.Email != nil && *cfg.Email != "" {
-		notifiers = append(notifiers, &notifications.EmailNotifier{
-			APIKey: s.resendAPIKey,
-			From:   s.emailFrom,
-			To:     *cfg.Email,
-		})
-	}
-
-	return notifiers
-}
-
-func sendWithRetry(ctx context.Context, n notifications.Notifier, message string, meta notifications.AlertMetadata) error {
-	var lastErr error
-	for attempt := range notificationMaxRetries {
-		if attempt > 0 {
-			wait := notificationRetryBase * time.Duration(1<<(attempt-1))
-			select {
-			case <-ctx.Done():
-				return ctx.Err()
-			case <-time.After(wait):
-			}
-		}
-
-		if err := n.Send(ctx, message, meta); err != nil {
-			log.Printf("Notification attempt %d/%d failed: %v", attempt+1, notificationMaxRetries, err)
-			lastErr = err
-			continue
-		}
-
-		return nil
-	}
-
-	return lastErr
-}
-
-func (s *EvaluatorService) sendNotification(ctx context.Context, userID, message string, obs domain.ObservedTx, addressLabel string, rule domain.AlertRule, address string) {
+func (s *EvaluatorService) sendNotifications(ctx context.Context, userID, message string, obs domain.ObservedTx, addressLabel string, rule domain.AlertRule, address string) {
 	notifConfig, err := s.notifConfigs.GetConfig(ctx, userID)
 	if err != nil {
 		log.Printf("Failed to get notification config: %v", err)
@@ -271,20 +196,35 @@ func (s *EvaluatorService) sendNotification(ctx context.Context, userID, message
 		Address:      address,
 	}

-	for _, n := range s.buildNotifiers(notifConfig) {
-		if err := sendWithRetry(ctx, n, message, meta); err != nil {
-			log.Printf("Notification channel failed for user %s after retries: %v", userID, err)
+	if notifConfig.DiscordWebhookURL != nil && *notifConfig.DiscordWebhookURL != "" {
+		sent, err := notifications.SendDiscordNotification(*notifConfig.DiscordWebhookURL, message, meta)
+		if err != nil || !sent {
+			log.Printf("Discord notification failed for user %s: %v", userID, err)
 		} else {
-			log.Printf("Notification sent to user %s via %T", userID, n)
+			log.Printf("Discord notification sent to user %s", userID)
+		}
+	}
+
+	if notifConfig.SlackWebhookURL != nil && *notifConfig.SlackWebhookURL != "" {
+		sent, err := notifications.SendSlackNotification(*notifConfig.SlackWebhookURL, message, meta)
+		if err != nil || !sent {
+			log.Printf("Slack notification failed for user %s: %v", userID, err)
+		} else {
+			log.Printf("Slack notification sent to user %s", userID)
+		}
+	}
+
+	if notifConfig.Email != nil && *notifConfig.Email != "" && s.smtpConfig.IsConfigured() {
+		sent, err := notifications.SendEmailNotification(s.smtpConfig, *notifConfig.Email, message, meta)
+		if err != nil || !sent {
+			log.Printf("Email notification failed for user %s: %v", userID, err)
+		} else {
+			log.Printf("Email notification sent to user %s (%s)", userID, *notifConfig.Email)
 		}
 	}
 }

 func (s *EvaluatorService) buildMessage(rule domain.AlertRule, obs domain.ObservedTx) string {
-	if obs.IsTokenTransfer() {
-		return s.buildTokenMessage(rule, obs)
-	}
-
 	switch rule.Type {
 	case domain.AlertIncomingTx:
 		ethStr, _ := wei.FormatAsEth(obs.Value, 4)
@@ -309,36 +249,3 @@ func (s *EvaluatorService) buildMessage(rule domain.AlertRule, obs domain.Observ
 		return "Alert triggered"
 	}
 }
-
-const defaultTokenDecimals = 18
-
-func (s *EvaluatorService) buildTokenMessage(rule domain.AlertRule, obs domain.ObservedTx) string {
-	symbol := "tokens"
-	if obs.TokenSymbol != nil {
-		symbol = *obs.TokenSymbol
-	}
-
-	amount := "unknown"
-	if obs.TokenValue != nil {
-		decimals := defaultTokenDecimals
-		if obs.TokenDecimals != nil {
-			decimals = *obs.TokenDecimals
-		}
-		amount = wei.FormatTokenAmount(*obs.TokenValue, decimals)
-	}
-
-	switch rule.Type {
-	case domain.AlertIncomingTx:
-		return fmt.Sprintf("Incoming transfer: %s %s received", amount, symbol)
-	case domain.AlertOutgoingTx:
-		return fmt.Sprintf("Outgoing transfer: %s %s sent", amount, symbol)
-	case domain.AlertLargeTransfer:
-		threshold := float64(0)
-		if rule.Threshold != nil {
-			threshold = *rule.Threshold
-		}
-		return fmt.Sprintf("Large token transfer: %s %s (threshold: %g)", amount, symbol, threshold)
-	default:
-		return fmt.Sprintf("Token transfer: %s %s", amount, symbol)
-	}
-}
--- a/backend-go/internal/services/observer.go
+++ b/backend-go/internal/services/observer.go
@@ -80,15 +80,6 @@ func (s *ObserverService) observeAddress(ctx context.Context, addr domain.Addres
 		}
 	}

-	tokenTxs, err := s.eth.GetTokenTransfers(ctx, startBlock, endBlock, addr.Address)
-	if err != nil {
-		log.Printf("Error fetching token transfers for %s: %v", addr.Address, err)
-	} else {
-		for _, tx := range tokenTxs {
-			observations = append(observations, createObservedTx(tx, addr))
-		}
-	}
-
 	if _, err := s.checkpoint.UpdateLastCheckedBlock(ctx, addr.ID, endBlock); err != nil {
 		return nil, err
 	}
--- a/backend-go/internal/services/observer_test.go
+++ b/backend-go/internal/services/observer_test.go
@@ -0,0 +1,113 @@
+package services
+
+import (
+	"testing"
+
+	"github.com/kjannette/koin-ping/backend-go/internal/domain"
+)
+
+func TestFilterRelevantTransactions(t *testing.T) {
+	to1 := "0xaaaa"
+	to2 := "0xbbbb"
+	to3 := "0xcccc"
+
+	txs := []domain.NormalizedTx{
+		{Hash: "0x1", From: "0xaaaa", To: &to2, Value: "1000"},
+		{Hash: "0x2", From: "0xbbbb", To: &to1, Value: "2000"},
+		{Hash: "0x3", From: "0xcccc", To: &to3, Value: "3000"},
+		{Hash: "0x4", From: "0xdddd", To: nil, Value: "0"},
+	}
+
+	t.Run("finds outgoing", func(t *testing.T) {
+		result := filterRelevantTransactions(txs, "0xAAAA")
+		if len(result) != 2 {
+			t.Fatalf("expected 2 relevant txs (1 from, 1 to), got %d", len(result))
+		}
+	})
+
+	t.Run("finds incoming", func(t *testing.T) {
+		result := filterRelevantTransactions(txs, "0xBBBB")
+		if len(result) != 2 {
+			t.Fatalf("expected 2 relevant txs, got %d", len(result))
+		}
+	})
+
+	t.Run("no match", func(t *testing.T) {
+		result := filterRelevantTransactions(txs, "0x9999")
+		if len(result) != 0 {
+			t.Fatalf("expected 0 relevant txs, got %d", len(result))
+		}
+	})
+
+	t.Run("case insensitive", func(t *testing.T) {
+		result := filterRelevantTransactions(txs, "0xAAAA")
+		if len(result) == 0 {
+			t.Fatal("should match case-insensitively")
+		}
+	})
+}
+
+func TestCreateObservedTx(t *testing.T) {
+	to := "0xaaaa"
+	tx := domain.NormalizedTx{
+		Hash:  "0xhash",
+		From:  "0xbbbb",
+		To:    &to,
+		Value: "1000",
+	}
+
+	t.Run("incoming direction", func(t *testing.T) {
+		addr := domain.Address{ID: 1, Address: "0xaaaa"}
+		obs := createObservedTx(tx, addr)
+		if obs.Direction != domain.DirectionIncoming {
+			t.Errorf("expected incoming, got %s", obs.Direction)
+		}
+		if obs.AddressID != 1 {
+			t.Errorf("expected address ID 1, got %d", obs.AddressID)
+		}
+	})
+
+	t.Run("outgoing direction", func(t *testing.T) {
+		addr := domain.Address{ID: 2, Address: "0xbbbb"}
+		obs := createObservedTx(tx, addr)
+		if obs.Direction != domain.DirectionOutgoing {
+			t.Errorf("expected outgoing, got %s", obs.Direction)
+		}
+	})
+}
+
+func TestGetStartBlock(t *testing.T) {
+	s := &ObserverService{}
+
+	t.Run("no checkpoint uses latest", func(t *testing.T) {
+		got := s.getStartBlock(0, false, 1000)
+		if got != 1000 {
+			t.Errorf("expected 1000, got %d", got)
+		}
+	})
+
+	t.Run("with checkpoint uses next block", func(t *testing.T) {
+		got := s.getStartBlock(999, true, 1000)
+		if got != 1000 {
+			t.Errorf("expected 1000, got %d", got)
+		}
+	})
+}
+
+func TestGetEndBlock(t *testing.T) {
+	s := &ObserverService{}
+
+	t.Run("caps at latest", func(t *testing.T) {
+		got := s.getEndBlock(990, 1000)
+		if got != 1000 {
+			t.Errorf("expected 1000, got %d", got)
+		}
+	})
+
+	t.Run("caps at maxBlocksPerRun", func(t *testing.T) {
+		got := s.getEndBlock(0, 200)
+		if got != maxBlocksPerRun-1 {
+			t.Errorf("expected %d, got %d", maxBlocksPerRun-1, got)
+		}
+	})
+}
--- a/backend-go/internal/wei/converter.go
+++ b/backend-go/internal/wei/converter.go
@@ -98,54 +98,3 @@ func FormatAsEth(weiString string, decimals int) (string, error) {
 	}
 	return fmt.Sprintf("%.*f ETH", decimals, eth), nil
 }
-
-// FormatTokenAmount formats a raw token amount using the token's decimal places.
-// For example, 1000000 USDT (6 decimals) becomes "1".
-func FormatTokenAmount(rawValue string, tokenDecimals int) string {
-	if rawValue == "" || rawValue == "0" {
-		return "0"
-	}
-
-	n, ok := new(big.Int).SetString(rawValue, 10)
-	if !ok {
-		return "0"
-	}
-
-	divisor := new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(tokenDecimals)), nil) //nolint:mnd
-	whole := new(big.Int).Div(n, divisor)
-	remainder := new(big.Int).Mod(n, divisor)
-
-	if remainder.Sign() == 0 {
-		return addThousandsSeparators(whole.String())
-	}
-
-	fracStr := fmt.Sprintf("%0*s", tokenDecimals, remainder.String())
-	fracStr = strings.TrimRight(fracStr, "0")
-	const maxDisplayDecimals = 4
-	if len(fracStr) > maxDisplayDecimals {
-		fracStr = fracStr[:maxDisplayDecimals]
-	}
-
-	return addThousandsSeparators(whole.String()) + "." + fracStr
-}
-
-func addThousandsSeparators(s string) string {
-	if len(s) <= 3 { //nolint:mnd
-		return s
-	}
-
-	var result strings.Builder
-	offset := len(s) % 3 //nolint:mnd
-	if offset > 0 {
-		result.WriteString(s[:offset])
-	}
-
-	for i := offset; i < len(s); i += 3 { //nolint:mnd
-		if result.Len() > 0 {
-			result.WriteByte(',')
-		}
-		result.WriteString(s[i : i+3]) //nolint:mnd
-	}
-
-	return result.String()
-}
--- a/backend-go/internal/wei/converter_test.go
+++ b/backend-go/internal/wei/converter_test.go
@@ -0,0 +1,179 @@
+package wei
+
+import (
+	"math"
+	"testing"
+)
+
+func TestToEth(t *testing.T) {
+	tests := []struct {
+		name    string
+		wei     string
+		want    float64
+		wantErr bool
+	}{
+		{"zero string", "0", 0, false},
+		{"empty string", "", 0, false},
+		{"1 ETH", "1000000000000000000", 1.0, false},
+		{"0.5 ETH", "500000000000000000", 0.5, false},
+		{"10 ETH", "10000000000000000000", 10.0, false},
+		{"small amount", "1000000000000000", 0.001, false},
+		{"1 Wei", "1", 1e-18, false},
+		{"invalid", "notanumber", 0, true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := ToEth(tt.wei)
+			if tt.wantErr {
+				if err == nil {
+					t.Fatal("expected error")
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			if math.Abs(got-tt.want) > 1e-10 {
+				t.Fatalf("ToEth(%q) = %v, want %v", tt.wei, got, tt.want)
+			}
+		})
+	}
+}
+
+func TestFromEth(t *testing.T) {
+	tests := []struct {
+		name    string
+		eth     float64
+		want    string
+		wantErr bool
+	}{
+		{"zero", 0, "0", false},
+		{"1 ETH", 1.0, "1000000000000000000", false},
+		{"0.5 ETH", 0.5, "500000000000000000", false},
+		{"10 ETH", 10.0, "10000000000000000000", false},
+		{"0.001 ETH", 0.001, "1000000000000000", false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := FromEth(tt.eth)
+			if tt.wantErr {
+				if err == nil {
+					t.Fatal("expected error")
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			if got != tt.want {
+				t.Fatalf("FromEth(%v) = %q, want %q", tt.eth, got, tt.want)
+			}
+		})
+	}
+}
+
+func TestRoundTrip(t *testing.T) {
+	values := []float64{0.001, 0.1, 1.0, 5.5, 10.0, 100.0}
+	for _, eth := range values {
+		weiStr, err := FromEth(eth)
+		if err != nil {
+			t.Fatalf("FromEth(%v) error: %v", eth, err)
+		}
+		back, err := ToEth(weiStr)
+		if err != nil {
+			t.Fatalf("ToEth(%q) error: %v", weiStr, err)
+		}
+		if math.Abs(back-eth) > 1e-10 {
+			t.Fatalf("round-trip %v → %q → %v (diff: %v)", eth, weiStr, back, back-eth)
+		}
+	}
+}
+
+func TestCompare(t *testing.T) {
+	tests := []struct {
+		name string
+		a, b string
+		want int
+	}{
+		{"equal", "1000", "1000", 0},
+		{"a > b", "2000", "1000", 1},
+		{"a < b", "1000", "2000", -1},
+		{"zero equal", "0", "0", 0},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := Compare(tt.a, tt.b)
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			if got != tt.want {
+				t.Fatalf("Compare(%q, %q) = %d, want %d", tt.a, tt.b, got, tt.want)
+			}
+		})
+	}
+}
+
+func TestGreaterThanOrEqual(t *testing.T) {
+	ok, err := GreaterThanOrEqual("2000", "1000")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !ok {
+		t.Fatal("expected true")
+	}
+
+	ok, err = GreaterThanOrEqual("1000", "1000")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !ok {
+		t.Fatal("expected true for equal")
+	}
+
+	ok, err = GreaterThanOrEqual("500", "1000")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if ok {
+		t.Fatal("expected false")
+	}
+}
+
+func TestLessThan(t *testing.T) {
+	ok, err := LessThan("500", "1000")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !ok {
+		t.Fatal("expected true")
+	}
+
+	ok, err = LessThan("1000", "1000")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if ok {
+		t.Fatal("expected false for equal")
+	}
+}
+
+func TestFormatAsEth(t *testing.T) {
+	got, err := FormatAsEth("1000000000000000000", 4)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got != "1.0000 ETH" {
+		t.Fatalf("got %q, want %q", got, "1.0000 ETH")
+	}
+
+	got, err = FormatAsEth("500000000000000000", 2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got != "0.50 ETH" {
+		t.Fatalf("got %q, want %q", got, "0.50 ETH")
+	}
+}
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -5,19 +5,16 @@ React + Vite frontend for the on-chain monitoring and alerting system.
 ## Getting Started

 1. Install dependencies:
-
   ```bash
   npm install
   ```

 2. Run the development server:
-
   ```bash
   npm run dev
   ```

 3. Build for production:
-
   ```bash
   npm run build
   ```
@@ -37,5 +34,5 @@ React + Vite frontend for the on-chain monitoring and alerting system.

 ## Development

-The frontend runs on port 3000 and proxies API requests to the backend running
-on port 5000.
+The frontend runs on port 3000 and proxies API requests to the backend running on port 5000.
+
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -18,7 +18,6 @@
        "@types/react": "^19.2.7",
        "@types/react-dom": "^19.2.3",
        "@vitejs/plugin-react": "^5.1.2",
-                "prettier": "^3.8.1",
        "typescript": "^5.9.3",
        "vite": "^7.3.0"
      }
@@ -2413,22 +2412,6 @@
        "node": "^10 || ^12 || >=14"
      }
    },
-        "node_modules/prettier": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
-            "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "prettier": "bin/prettier.cjs"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/prettier/prettier?sponsor=1"
-            }
-        },
    "node_modules/protobufjs": {
      "version": "7.5.4",
      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.4.tgz",
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,20 +1,17 @@
 {
  "name": "frontend",
  "version": "1.0.0",
-    "description": "koin_ping blockchain monitor UI",
+  "description": "koin_ping blockchain monoitor UI",
  "main": "index.js",
  "scripts": {
    "dev": "vite",
    "build": "vite build",
-        "preview": "vite preview",
-        "test": "vite build",
-        "lint": "prettier --check 'src/**/*.{js,jsx,ts,tsx,css}'",
-        "fmt": "prettier --write 'src/**/*.{js,jsx,ts,tsx,css}'"
+    "preview": "vite preview"
  },
  "keywords": [
    "cryptocurrency",
    "blockchain",
-        "blockchain event monitoring"
+    "blockchain event moitoring"
  ],
  "author": "Steven Jannette",
  "license": "MIT",
@@ -29,7 +26,6 @@
    "@types/react": "^19.2.7",
    "@types/react-dom": "^19.2.3",
    "@vitejs/plugin-react": "^5.1.2",
-        "prettier": "^3.8.1",
    "typescript": "^5.9.3",
    "vite": "^7.3.0"
  }
--- a/frontend/prettierrc
+++ b/frontend/prettierrc
@@ -1,4 +0,0 @@
-{
-    "tabWidth": 4,
-    "proseWrap": "always"
-}
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -1,36 +1,60 @@
-import { Routes, Route, Navigate } from "react-router-dom";
+import { Routes, Route, Link, Navigate } from "react-router-dom";
 import { useAuth } from "./contexts/AuthContext";
-import Navbar from "./components/Navbar";
 import Login from "./pages/Login";
 import Signup from "./pages/Signup";
-import Onboarding from "./pages/Onboarding";
 import Addresses from "./pages/Addresses";
 import Alerts from "./pages/Alerts";
 import AlertHistory from "./pages/AlertHistory";

 export default function App() {
-    const { currentUser } = useAuth();
+  const { currentUser, logout } = useAuth();

+  // Show login/signup routes if not authenticated
  if (!currentUser) {
    return (
      <Routes>
        <Route path="/login" element={<Login />} />
        <Route path="/signup" element={<Signup />} />
-                <Route path="/onboarding" element={<Onboarding />} />
        <Route path="*" element={<Navigate to="/login" />} />
      </Routes>
    );
  }

+  // Show main app if authenticated
  return (
+    <div style={{ padding: "1rem" }}>
+      <nav style={{ marginBottom: "1rem", display: "flex", justifyContent: "space-between", alignItems: "center" }}>
        <div>
-            <Navbar />
+          <Link to="/addresses">Addresses</Link>{" | "}
+          <Link to="/alerts">Alerts</Link>{" | "}
+          <Link to="/history">History</Link>
+        </div>
+        <div style={{ display: "flex", alignItems: "center", gap: "1rem" }}>
+          <span style={{ fontSize: "0.9rem", color: "#999" }}>
+            {currentUser.email}
+          </span>
+          <button
+            onClick={logout}
+            style={{
+              padding: "0.5rem 1rem",
+              fontSize: "0.9rem",
+              backgroundColor: "#333",
+              color: "white",
+              border: "1px solid #555",
+              borderRadius: "4px",
+              cursor: "pointer"
+            }}
+          >
+            Logout
+          </button>
+        </div>
+      </nav>
+
      <Routes>
        <Route path="/" element={<Addresses />} />
        <Route path="/addresses" element={<Addresses />} />
        <Route path="/alerts" element={<Alerts />} />
-                <Route path="/alertevents" element={<AlertHistory />} />
-                <Route path="/onboarding" element={<Onboarding />} />
+        <Route path="/history" element={<AlertHistory />} />
        <Route path="*" element={<Navigate to="/addresses" />} />
      </Routes>
    </div>
--- a/frontend/src/api/addresses.jsx
+++ b/frontend/src/api/addresses.jsx
@@ -1,7 +1,7 @@
 // API client for address management

-import { getAuthHeaders, getAuthHeadersSimple } from "./authHeaders";
-import { API_BASE } from "./config";
+import { getAuthHeaders, getAuthHeadersSimple } from './authHeaders';
+import { API_BASE } from './config';

 /**
 * Create a new blockchain address to monitor
@@ -14,14 +14,14 @@ export async function createAddress(data) {
  try {
  const headers = await getAuthHeaders();
  const response = await fetch(`${API_BASE}/addresses`, {
-            method: "POST",
+    method: 'POST',
    headers: headers,
-            body: JSON.stringify(data),
+    body: JSON.stringify(data)
  });
  
  if (!response.ok) {
      // Try to parse error response, but handle if it's not JSON
-            let errorMessage = "Failed to create address";
+      let errorMessage = 'Failed to create address';
      try {
    const error = await response.json();
        errorMessage = error.message || errorMessage;
@@ -35,10 +35,8 @@ export async function createAddress(data) {
  return response.json();
  } catch (error) {
    // Handle network errors
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
+    if (error.message.includes('fetch')) {
+      throw new Error('Cannot connect to server. Is the backend running?');
    }
    throw error;
  }
@@ -52,12 +50,12 @@ export async function getAddresses() {
  try {
  const headers = await getAuthHeadersSimple();
  const response = await fetch(`${API_BASE}/addresses`, {
-            headers: headers,
+    headers: headers
  });
  
  if (!response.ok) {
      // Try to parse error response, but handle if it's not JSON
-            let errorMessage = "Failed to fetch addresses";
+      let errorMessage = 'Failed to fetch addresses';
      try {
    const error = await response.json();
        errorMessage = error.message || errorMessage;
@@ -71,45 +69,8 @@ export async function getAddresses() {
  return response.json();
  } catch (error) {
    // Handle network errors or JSON parse errors
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
-        }
-        throw error;
-    }
-}
-
-/**
- * Update an address (e.g. change its label)
- * @param {number} addressId - Address ID to update
- * @param {Object} data - Fields to update (e.g. { label: "New Label" })
- * @returns {Promise<Object>} Updated address
- */
-export async function updateAddress(addressId, data) {
-    try {
-        const headers = await getAuthHeaders();
-        const response = await fetch(`${API_BASE}/addresses/${addressId}`, {
-            method: "PATCH",
-            headers: headers,
-            body: JSON.stringify(data),
-        });
-
-        if (!response.ok) {
-            let errorMessage = "Failed to update address";
-            try {
-                const error = await response.json();
-                errorMessage = error.message || errorMessage;
-            } catch {
-                errorMessage = `Server error: ${response.status} ${response.statusText}`;
-            }
-            throw new Error(errorMessage);
-        }
-
-        return response.json();
-    } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error("Cannot connect to server. Is the backend running?");
+    if (error.message.includes('fetch')) {
+      throw new Error('Cannot connect to server. Is the backend running?');
    }
    throw error;
  }
@@ -124,13 +85,13 @@ export async function deleteAddress(addressId) {
  try {
  const headers = await getAuthHeadersSimple();
  const response = await fetch(`${API_BASE}/addresses/${addressId}`, {
-            method: "DELETE",
-            headers: headers,
+    method: 'DELETE',
+    headers: headers
  });
  
  if (!response.ok && response.status !== 204) {
      // Try to parse error response, but handle if it's not JSON
-            let errorMessage = "Failed to delete address";
+      let errorMessage = 'Failed to delete address';
      try {
    const error = await response.json();
        errorMessage = error.message || errorMessage;
@@ -142,11 +103,10 @@ export async function deleteAddress(addressId) {
    }
  } catch (error) {
    // Handle network errors
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
+    if (error.message.includes('fetch')) {
+      throw new Error('Cannot connect to server. Is the backend running?');
    }
    throw error;
  }
 }
+
--- a/frontend/src/api/alertEvents.jsx
+++ b/frontend/src/api/alertEvents.jsx
@@ -1,7 +1,7 @@
 // API client for alert event history

-import { getAuthHeadersSimple } from "./authHeaders";
-import { API_BASE } from "./config";
+import { getAuthHeadersSimple } from './authHeaders';
+import { API_BASE } from './config';

 /**
 * Get all alert events (history)
@@ -11,11 +11,11 @@ export async function getAlertEvents() {
  try {
  const headers = await getAuthHeadersSimple();
  const response = await fetch(`${API_BASE}/alert-events`, {
-            headers: headers,
+    headers: headers
  });
  
  if (!response.ok) {
-            let errorMessage = "Failed to fetch alert events";
+      let errorMessage = 'Failed to fetch alert events';
      try {
    const error = await response.json();
        errorMessage = error.message || errorMessage;
@@ -27,10 +27,8 @@ export async function getAlertEvents() {
  
  return response.json();
  } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
+    if (error.message.includes('fetch')) {
+      throw new Error('Cannot connect to server. Is the backend running?');
    }
    throw error;
  }
--- a/frontend/src/api/alerts.jsx
+++ b/frontend/src/api/alerts.jsx
@@ -1,16 +1,16 @@
 // API client for alert rule management

-import { getAuthHeaders, getAuthHeadersSimple } from "./authHeaders";
-import { API_BASE } from "./config";
+import { getAuthHeaders, getAuthHeadersSimple } from './authHeaders';
+import { API_BASE } from './config';

 /**
 * Alert types supported by the system
 */
 export const ALERT_TYPES = {
-    INCOMING_TX: "incoming_tx",
-    OUTGOING_TX: "outgoing_tx",
-    LARGE_TRANSFER: "large_transfer",
-    BALANCE_BELOW: "balance_below",
+  INCOMING_TX: 'incoming_tx',
+  OUTGOING_TX: 'outgoing_tx',
+  LARGE_TRANSFER: 'large_transfer',
+  BALANCE_BELOW: 'balance_below'
 };

 /**
@@ -24,17 +24,14 @@ export const ALERT_TYPES = {
 export async function createAlert(addressId, data) {
  try {
  const headers = await getAuthHeaders();
-        const response = await fetch(
-            `${API_BASE}/addresses/${addressId}/alerts`,
-            {
-                method: "POST",
+  const response = await fetch(`${API_BASE}/addresses/${addressId}/alerts`, {
+    method: 'POST',
    headers: headers,
-                body: JSON.stringify(data),
-            },
-        );
+    body: JSON.stringify(data)
+  });
  
  if (!response.ok) {
-            let errorMessage = "Failed to create alert rule";
+      let errorMessage = 'Failed to create alert rule';
      try {
    const error = await response.json();
        errorMessage = error.message || errorMessage;
@@ -46,10 +43,8 @@ export async function createAlert(addressId, data) {
  
  return response.json();
  } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
+    if (error.message.includes('fetch')) {
+      throw new Error('Cannot connect to server. Is the backend running?');
    }
    throw error;
  }
@@ -63,15 +58,12 @@ export async function createAlert(addressId, data) {
 export async function getAlerts(addressId) {
  try {
  const headers = await getAuthHeadersSimple();
-        const response = await fetch(
-            `${API_BASE}/addresses/${addressId}/alerts`,
-            {
-                headers: headers,
-            },
-        );
+  const response = await fetch(`${API_BASE}/addresses/${addressId}/alerts`, {
+    headers: headers
+  });
  
  if (!response.ok) {
-            let errorMessage = "Failed to fetch alert rules";
+      let errorMessage = 'Failed to fetch alert rules';
      try {
    const error = await response.json();
        errorMessage = error.message || errorMessage;
@@ -83,10 +75,8 @@ export async function getAlerts(addressId) {
  
  return response.json();
  } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
+    if (error.message.includes('fetch')) {
+      throw new Error('Cannot connect to server. Is the backend running?');
    }
    throw error;
  }
@@ -102,13 +92,13 @@ export async function updateAlertStatus(alertId, enabled) {
  try {
  const headers = await getAuthHeaders();
  const response = await fetch(`${API_BASE}/alerts/${alertId}`, {
-            method: "PATCH",
+    method: 'PATCH',
    headers: headers,
-            body: JSON.stringify({ enabled }),
+    body: JSON.stringify({ enabled })
  });
  
  if (!response.ok) {
-            let errorMessage = "Failed to update alert rule";
+      let errorMessage = 'Failed to update alert rule';
      try {
    const error = await response.json();
        errorMessage = error.message || errorMessage;
@@ -120,10 +110,8 @@ export async function updateAlertStatus(alertId, enabled) {
  
  return response.json();
  } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
+    if (error.message.includes('fetch')) {
+      throw new Error('Cannot connect to server. Is the backend running?');
    }
    throw error;
  }
@@ -138,12 +126,12 @@ export async function deleteAlert(alertId) {
  try {
  const headers = await getAuthHeadersSimple();
  const response = await fetch(`${API_BASE}/alerts/${alertId}`, {
-            method: "DELETE",
-            headers: headers,
+    method: 'DELETE',
+    headers: headers
  });
  
  if (!response.ok && response.status !== 204) {
-            let errorMessage = "Failed to delete alert rule";
+      let errorMessage = 'Failed to delete alert rule';
      try {
    const error = await response.json();
        errorMessage = error.message || errorMessage;
@@ -153,10 +141,8 @@ export async function deleteAlert(alertId) {
      throw new Error(errorMessage);
    }
  } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
+    if (error.message.includes('fetch')) {
+      throw new Error('Cannot connect to server. Is the backend running?');
    }
    throw error;
  }
--- a/frontend/src/api/authHeaders.js
+++ b/frontend/src/api/authHeaders.js
@@ -5,7 +5,7 @@
 * Includes Firebase ID token in Authorization header
 */

-import { auth } from "../firebase/config";
+import { auth } from '../firebase/config';

 /**
 * Get headers with authentication token
@@ -15,15 +15,15 @@ export async function getAuthHeaders() {
  const currentUser = auth.currentUser;
  
  if (!currentUser) {
-        throw new Error("No authenticated user");
+    throw new Error('No authenticated user');
  }

  // Get Firebase ID token
  const token = await currentUser.getIdToken();

  return {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${token}`,
+    'Content-Type': 'application/json',
+    'Authorization': `Bearer ${token}`
  };
 }

@@ -35,12 +35,13 @@ export async function getAuthHeadersSimple() {
  const currentUser = auth.currentUser;
  
  if (!currentUser) {
-        throw new Error("No authenticated user");
+    throw new Error('No authenticated user');
  }

  const token = await currentUser.getIdToken();

  return {
-        Authorization: `Bearer ${token}`,
+    'Authorization': `Bearer ${token}`
  };
 }
+
--- a/frontend/src/api/config.js
+++ b/frontend/src/api/config.js
@@ -1 +1 @@
-export const API_BASE = import.meta.env.VITE_API_BASE || "/v1";
+export const API_BASE = import.meta.env.VITE_API_BASE || '/v1';
--- a/frontend/src/api/notificationConfig.jsx
+++ b/frontend/src/api/notificationConfig.jsx
@@ -1,5 +1,5 @@
-import { getAuthHeaders } from "./authHeaders";
-import { API_BASE } from "./config";
+import { getAuthHeaders } from './authHeaders';
+import { API_BASE } from './config';

 /**
 * Get notification configuration for current user
@@ -9,11 +9,11 @@ export async function getNotificationConfig() {
  try {
    const headers = await getAuthHeaders();
    const response = await fetch(`${API_BASE}/notification-config`, {
-            headers: headers,
+      headers: headers
    });
    
    if (!response.ok) {
-            let errorMessage = "Failed to fetch notification config";
+      let errorMessage = 'Failed to fetch notification config';
      try {
        const error = await response.json();
        errorMessage = error.message || errorMessage;
@@ -25,10 +25,8 @@ export async function getNotificationConfig() {
    
    return response.json();
  } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
+    if (error.message.includes('fetch')) {
+      throw new Error('Cannot connect to server. Is the backend running?');
    }
    throw error;
  }
@@ -36,26 +34,24 @@ export async function getNotificationConfig() {

 /**
 * Update notification configuration
- * @param {Object} config
- * @param {string} [config.discord_webhook_url]
- * @param {string} [config.telegram_chat_id]
- * @param {string} [config.telegram_bot_token]
- * @param {string} [config.email]
- * @param {string} [config.slack_webhook_url]
- * @param {boolean} [config.notification_enabled]
+ * @param {Object} config - Configuration to update
+ * @param {string} [config.discord_webhook_url] - Discord webhook URL
+ * @param {string} [config.slack_webhook_url] - Slack webhook URL
+ * @param {string} [config.email] - Email address
+ * @param {boolean} [config.notification_enabled] - Enable/disable notifications
 * @returns {Promise<Object>} Updated config
 */
 export async function updateNotificationConfig(config) {
  try {
    const headers = await getAuthHeaders();
    const response = await fetch(`${API_BASE}/notification-config`, {
-            method: "PUT",
+      method: 'PUT',
      headers: headers,
-            body: JSON.stringify(config),
+      body: JSON.stringify(config)
    });
    
    if (!response.ok) {
-            let errorMessage = "Failed to update notification config";
+      let errorMessage = 'Failed to update notification config';
      try {
        const error = await response.json();
        errorMessage = error.message || errorMessage;
@@ -67,117 +63,54 @@ export async function updateNotificationConfig(config) {
    
    return response.json();
  } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
+    if (error.message.includes('fetch')) {
+      throw new Error('Cannot connect to server. Is the backend running?');
    }
    throw error;
  }
 }

 /**
- * Set up email notifications via Resend.
- * Reads the user's saved email from their config and sends a confirmation.
- * @returns {Promise<Object>} Setup result
+ * Test a webhook URL by sending a test message via the backend
+ * @param {string} type - 'discord' or 'slack'
+ * @param {string} webhookUrl - Webhook URL to test
+ * @returns {Promise<boolean>} True if test successful
 */
-export async function setupEmail() {
+async function testWebhook(type, webhookUrl) {
  try {
    const headers = await getAuthHeaders();
-        const response = await fetch(`${API_BASE}/email/setup`, {
-            method: "POST",
+    const response = await fetch(`${API_BASE}/notification-config/test`, {
+      method: 'POST',
      headers: headers,
+      body: JSON.stringify({ type, url: webhookUrl })
    });

    if (!response.ok) {
-            let errorMessage = "Failed to set up email";
-            try {
-                const error = await response.json();
-                errorMessage = error.message || errorMessage;
-            } catch {
-                errorMessage = `Server error: ${response.status} ${response.statusText}`;
-            }
-            throw new Error(errorMessage);
+      return false;
    }

-        return response.json();
+    const result = await response.json();
+    return result.success === true;
  } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
-        }
-        throw error;
+    console.error(`${type} webhook test failed:`, error);
+    return false;
  }
 }

 /**
- * Send an alert digest email to the user's configured email address.
- * @returns {Promise<Object>} Digest send result
+ * Test a Discord webhook URL
+ * @param {string} webhookUrl - Discord webhook URL to test
+ * @returns {Promise<boolean>} True if test successful
 */
-export async function sendEmailDigest() {
-    try {
-        const headers = await getAuthHeaders();
-        const response = await fetch(`${API_BASE}/email/digest`, {
-            method: "POST",
-            headers: headers,
-        });
-
-        if (!response.ok) {
-            let errorMessage = "Failed to send digest";
-            try {
-                const error = await response.json();
-                errorMessage = error.message || errorMessage;
-            } catch {
-                errorMessage = `Server error: ${response.status} ${response.statusText}`;
-            }
-            throw new Error(errorMessage);
-        }
-
-        return response.json();
-    } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
-        }
-        throw error;
-    }
+export async function testDiscordWebhook(webhookUrl) {
+  return testWebhook('discord', webhookUrl);
 }

 /**
- * Test all configured notification channels via the backend
- * @returns {Promise<Object>} Results per channel
+ * Test a Slack webhook URL
+ * @param {string} webhookUrl - Slack webhook URL to test
+ * @returns {Promise<boolean>} True if test successful
 */
-export async function testNotificationChannels() {
-    try {
-        const headers = await getAuthHeaders();
-        const response = await fetch(
-            `${API_BASE}/notification-config/test`,
-            {
-                method: "POST",
-                headers: headers,
-            },
-        );
-
-        if (!response.ok) {
-            let errorMessage = "Failed to test notification channels";
-            try {
-                const error = await response.json();
-                errorMessage = error.message || errorMessage;
-            } catch {
-                errorMessage = `Server error: ${response.status} ${response.statusText}`;
-            }
-            throw new Error(errorMessage);
-        }
-
-        return response.json();
-    } catch (error) {
-        if (error.message.includes("fetch")) {
-            throw new Error(
-                "Cannot connect to server. Is the backend running?",
-            );
-        }
-        throw error;
-    }
+export async function testSlackWebhook(webhookUrl) {
+  return testWebhook('slack', webhookUrl);
 }
--- a/frontend/src/api/status.jsx
+++ b/frontend/src/api/status.jsx
@@ -1,6 +1,6 @@
 // API client for system status

-import { API_BASE } from "./config";
+import { API_BASE } from './config';

 /**
 * Get system status including latest processed block and health
@@ -11,7 +11,7 @@ export async function getSystemStatus() {
  
  if (!response.ok) {
    const error = await response.json();
-        throw new Error(error.message || "Failed to fetch system status");
+    throw new Error(error.message || 'Failed to fetch system status');
  }
  
  return response.json();
--- a/frontend/src/components/AlertForm.jsx
+++ b/frontend/src/components/AlertForm.jsx
@@ -45,8 +45,8 @@ export default function AlertForm({ onSubmit }) {
              value={opt.value}
              checked={type === opt.value}
              onChange={() => setType(opt.value)}
-                        />{" "}
-                        {opt.label}
+            />
+            {" "}{opt.label}
          </label>
        ))}
      </div>
--- a/frontend/src/components/Button.jsx
+++ b/frontend/src/components/Button.jsx
@@ -20,3 +20,4 @@ export default function Button({
      </button>
    );
  }
+  
--- a/frontend/src/components/Input.jsx
+++ b/frontend/src/components/Input.jsx
@@ -30,3 +30,4 @@ export default function Input({
      </label>
    );
  }
+  
--- a/frontend/src/components/Navbar.jsx
+++ b/frontend/src/components/Navbar.jsx
@@ -1,85 +0,0 @@
-import { Link, useLocation } from "react-router-dom";
-import { useAuth } from "../contexts/AuthContext";
-
-const navLinks = [
-  { to: "/addresses", label: "Addresses" },
-  { to: "/alerts", label: "Configure Alerts" },
-  { to: "/alertevents", label: "Alert Events" },
-];
-
-export default function Navbar() {
-  const { currentUser, logout } = useAuth();
-  const location = useLocation();
-
-  if (!currentUser) return null;
-
-  return (
-    <nav style={{
-      display: "flex",
-      justifyContent: "space-between",
-      alignItems: "center",
-      padding: "1rem 2rem",
-      marginBottom: "1.5rem",
-      backgroundColor: "#1a1a1a",
-      borderBottom: "1px solid #333",
-    }}>
-      <div style={{ display: "flex", alignItems: "center", gap: "0.5rem" }}>
-        <span style={{
-          fontWeight: 700,
-          fontSize: "1.1rem",
-          color: "#fff",
-          marginRight: "2rem",
-          letterSpacing: "0.5px",
-        }}>
-          Koin Ping
-        </span>
-
-        <div style={{ display: "flex", gap: "0.25rem" }}>
-          {navLinks.map(({ to, label }) => {
-            const isActive = location.pathname === to;
-            return (
-              <Link
-                key={to}
-                to={to}
-                style={{
-                  padding: "0.5rem 1.25rem",
-                  borderRadius: "6px",
-                  textDecoration: "none",
-                  fontSize: "1.425rem",
-                  fontWeight: isActive ? 600 : 200,
-                  color: isActive ? "#fff" : "#999",
-                  backgroundColor: isActive ? "#333" : "transparent",
-                  transition: "all 0.15s ease",
-                }}
-              >
-                {label}
-              </Link>
-            );
-          })}
-        </div>
-      </div>
-
-      <div style={{ display: "flex", alignItems: "center", gap: "1.25rem" }}>
-        <span style={{ fontSize: "1.275rem", color: "#777" }}>
-          {currentUser.email}
-        </span>
-        <button
-          onClick={logout}
-          style={{
-            padding: "0.4rem 1rem",
-            fontSize: "1.275rem",
-            fontWeight: 400,
-            backgroundColor: "transparent",
-            color: "#999",
-            border: "1px solid #444",
-            borderRadius: "6px",
-            cursor: "pointer",
-            transition: "all 0.15s ease",
-          }}
-        >
-          Logout
-        </button>
-      </div>
-    </nav>
-  );
-}
--- a/frontend/src/contexts/AuthContext.jsx
+++ b/frontend/src/contexts/AuthContext.jsx
@@ -4,14 +4,14 @@
 * Provides authentication state and methods throughout the app
 */

-import { createContext, useContext, useEffect, useState } from "react";
+import { createContext, useContext, useEffect, useState } from 'react';
 import { 
  createUserWithEmailAndPassword,
  signInWithEmailAndPassword,
  signOut,
-    onAuthStateChanged,
-} from "firebase/auth";
-import { auth } from "../firebase/config";
+  onAuthStateChanged
+} from 'firebase/auth';
+import { auth } from '../firebase/config';

 const AuthContext = createContext();

@@ -22,7 +22,7 @@ const AuthContext = createContext();
 export function useAuth() {
  const context = useContext(AuthContext);
  if (!context) {
-        throw new Error("useAuth must be used within AuthProvider");
+    throw new Error('useAuth must be used within AuthProvider');
  }
  return context;
 }
@@ -41,11 +41,7 @@ export function AuthProvider({ children }) {
  async function signup(email, password) {
    try {
      setError(null);
-            const result = await createUserWithEmailAndPassword(
-                auth,
-                email,
-                password,
-            );
+      const result = await createUserWithEmailAndPassword(auth, email, password);
      return result.user;
    } catch (err) {
      setError(err.message);
@@ -59,11 +55,7 @@ export function AuthProvider({ children }) {
  async function login(email, password) {
    try {
      setError(null);
-            const result = await signInWithEmailAndPassword(
-                auth,
-                email,
-                password,
-            );
+      const result = await signInWithEmailAndPassword(auth, email, password);
      return result.user;
    } catch (err) {
      setError(err.message);
@@ -103,7 +95,7 @@ export function AuthProvider({ children }) {
    login,
    logout,
    error,
-        loading,
+    loading
  };

  return (
@@ -112,3 +104,4 @@ export function AuthProvider({ children }) {
    </AuthContext.Provider>
  );
 }
+
--- a/frontend/src/firebase/config.js
+++ b/frontend/src/firebase/config.js
@@ -1,5 +1,6 @@
-import { initializeApp } from "firebase/app";
-import { getAuth } from "firebase/auth";
+
+import { initializeApp } from 'firebase/app';
+import { getAuth } from 'firebase/auth';
 import {
    firebaseApiKey,
    firebaseAuthDomain,
@@ -7,8 +8,9 @@ import {
    firebaseStorageBucket,
    firebaseMessagingSenderId,
    firebaseAppId,
-    firebaseMeasurementId,
-} from "../secrets.js";
+    firebaseMeasurementId
+} from '../secrets.js';
+

 const firebaseConfig = {
    apiKey: firebaseApiKey,
@@ -17,7 +19,7 @@ const firebaseConfig = {
    storageBucket: firebaseStorageBucket,
    messagingSenderId: firebaseMessagingSenderId,
    appId: firebaseAppId,
-    measurementId: firebaseMeasurementId,
+    measurementId: firebaseMeasurementId
  };

 const app = initializeApp(firebaseConfig);
@@ -25,3 +27,4 @@ const app = initializeApp(firebaseConfig);
 export const auth = getAuth(app);

 export default app;
+
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1,33 +0,0 @@
-@import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap');
-
-*,
-*::before,
-*::after {
-  box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-}
-
-html {
-  font-size: 14px;
-}
-
-body {
-  font-family: 'Nunito', sans-serif;
-  font-size: 1.5rem;
-  font-weight: 200;
-  line-height: 1.6;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  font-family: 'Nunito', sans-serif;
-  font-weight: 200;
-}
-
-input, select, textarea, button {
-  font-family: 'Nunito', sans-serif;
-  font-size: 1rem;
-  font-weight: 200;
-}
--- a/frontend/src/main.jsx
+++ b/frontend/src/main.jsx
@@ -3,7 +3,6 @@ import ReactDOM from "react-dom/client";
 import { BrowserRouter } from "react-router-dom";
 import { AuthProvider } from "./contexts/AuthContext";
 import App from "./App";
-import "./index.css";

 ReactDOM.createRoot(document.getElementById("root")).render(
  <React.StrictMode>
@@ -12,5 +11,5 @@ ReactDOM.createRoot(document.getElementById("root")).render(
        <App />
      </AuthProvider>
    </BrowserRouter>
-    </React.StrictMode>,
+  </React.StrictMode>
 );
--- a/frontend/src/pages/Addresses.jsx
+++ b/frontend/src/pages/Addresses.jsx
@@ -1,15 +1,14 @@
 import { useState, useEffect } from "react";
 import AddressForm from "../components/AddressForm";
-import { getAddresses, createAddress, deleteAddress, updateAddress } from "../api/addresses";
+import Button from "../components/Button";
+import { getAddresses, createAddress, deleteAddress } from "../api/addresses";

 export default function Addresses() {
  const [addresses, setAddresses] = useState([]);
  const [loading, setLoading] = useState(true);
  const [error, setError] = useState(null);
-    const [editingId, setEditingId] = useState(null);
-    const [editLabel, setEditLabel] = useState("");
+  const [deletingId, setDeletingId] = useState(null);

-    // Load addresses on mount
  useEffect(() => {
    async function fetchAddresses() {
      try {
@@ -27,7 +26,6 @@ export default function Addresses() {
    fetchAddresses();
  }, []);

-    // Handle new address submission
  async function handleAddressSubmit(data) {
    try {
      const newAddress = await createAddress(data);
@@ -39,44 +37,24 @@ export default function Addresses() {
    }
  }

-    async function handleDelete(id, label) {
-        const displayName = label || "this address";
-        if (!window.confirm(`Remove "${displayName}"? This will also delete all associated alert rules.`)) {
+  async function handleDelete(addressId) {
+    if (!window.confirm("Delete this address? All associated alert rules and events will also be removed.")) {
      return;
    }
+
    try {
-            await deleteAddress(id);
-            setAddresses((prev) => prev.filter((a) => a.id !== id));
+      setDeletingId(addressId);
+      await deleteAddress(addressId);
+      setAddresses((prev) => prev.filter((a) => a.id !== addressId));
      setError(null);
    } catch (err) {
      setError(err.message);
      console.error("Failed to delete address:", err);
+    } finally {
+      setDeletingId(null);
    }
  }

-    function handleEditStart(addr) {
-        setEditingId(addr.id);
-        setEditLabel(addr.label ?? "");
-    }
-
-    async function handleEditSave(id) {
-        try {
-            const updated = await updateAddress(id, { label: editLabel || null });
-            setAddresses((prev) => prev.map((a) => (a.id === id ? updated : a)));
-            setEditingId(null);
-            setEditLabel("");
-            setError(null);
-        } catch (err) {
-            setError(err.message);
-            console.error("Failed to update address:", err);
-        }
-    }
-
-    function handleEditCancel() {
-        setEditingId(null);
-        setEditLabel("");
-    }
-
  return (
    <div style={{ maxWidth: "800px", margin: "0 auto", padding: "2rem" }}>
      <h1>Tracked Addresses</h1>
@@ -90,7 +68,7 @@ export default function Addresses() {
        {loading && <p>Loading addresses...</p>}
        {error && <p style={{ color: "red" }}>Error: {error}</p>}
        {!loading && !error && addresses.length === 0 && (
-                    <p style={{ color: "#808080" }}>
+          <p style={{ color: "#666" }}>
            No addresses tracked yet. Add one above to get started.
          </p>
        )}
@@ -104,92 +82,32 @@ export default function Addresses() {
                  marginBottom: "0.5rem",
                  border: "1px solid #444",
                  borderRadius: "4px",
-                                    backgroundColor: "#333",
+                  backgroundColor: "#2a2a2a",
+                  display: "flex",
+                  justifyContent: "space-between",
+                  alignItems: "center",
                }}
              >
-                                <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
-                                    <div style={{ flex: 1 }}>
-                                        {editingId === addr.id ? (
-                                            <div style={{ display: "flex", gap: "0.5rem", alignItems: "center", marginBottom: "0.25rem" }}>
-                                                <input
-                                                    value={editLabel}
-                                                    onChange={(e) => setEditLabel(e.target.value)}
-                                                    placeholder="Label (optional)"
-                                                    style={{
-                                                        background: "#444",
-                                                        border: "1px solid #666",
-                                                        borderRadius: "3px",
-                                                        color: "#fff",
-                                                        padding: "0.25rem 0.5rem",
-                                                        fontSize: "0.9rem",
-                                                    }}
-                                                    onKeyDown={(e) => {
-                                                        if (e.key === "Enter") handleEditSave(addr.id);
-                                                        if (e.key === "Escape") handleEditCancel();
-                                                    }}
-                                                    autoFocus
-                                                />
-                                                <button
-                                                    onClick={() => handleEditSave(addr.id)}
-                                                    style={{ cursor: "pointer", padding: "0.25rem 0.6rem", fontSize: "0.85rem" }}
-                                                >
-                                                    Save
-                                                </button>
-                                                <button
-                                                    onClick={handleEditCancel}
-                                                    style={{ cursor: "pointer", padding: "0.25rem 0.6rem", fontSize: "0.85rem", background: "transparent", color: "#aaa", border: "1px solid #555" }}
-                                                >
-                                                    Cancel
-                                                </button>
-                                            </div>
-                                        ) : (
-                                            <div style={{ display: "flex", alignItems: "center", gap: "0.5rem", marginBottom: "0.25rem" }}>
-                                                <span style={{ fontWeight: "bold" }}>
+                <div>
+                  <div style={{ fontWeight: "bold", marginBottom: "0.25rem" }}>
                    {addr.label || "Unlabeled"}
-                                                </span>
-                                                <button
-                                                    onClick={() => handleEditStart(addr)}
-                                                    style={{
-                                                        cursor: "pointer",
-                                                        background: "transparent",
-                                                        border: "none",
-                                                        color: "#6699cc",
-                                                        fontSize: "0.8rem",
-                                                        padding: "0",
-                                                        textDecoration: "underline",
-                                                    }}
-                                                >
-                                                    Edit
-                                                </button>
                  </div>
-                                        )}
-                                        <div
-                                            style={{
-                                                fontFamily: "monospace",
-                                                fontSize: "1.035rem",
-                                                color: "#b3b3b3",
-                                            }}
-                                        >
+                  <div style={{ fontFamily: "monospace", fontSize: "0.9rem", color: "#999" }}>
                    {addr.address}
                  </div>
                </div>
-                                    <button
-                                        onClick={() => handleDelete(addr.id, addr.label)}
+                <Button
+                  onClick={() => handleDelete(addr.id)}
+                  disabled={deletingId === addr.id}
                  style={{
-                                            cursor: "pointer",
-                                            background: "transparent",
-                                            border: "1px solid #884444",
-                                            color: "#cc6666",
-                                            borderRadius: "3px",
-                                            padding: "0.3rem 0.7rem",
-                                            fontSize: "0.85rem",
-                                            marginLeft: "1rem",
-                                            flexShrink: 0,
+                    backgroundColor: deletingId === addr.id ? "#333" : "#dc3545",
+                    color: "white",
+                    border: "none",
+                    cursor: deletingId === addr.id ? "not-allowed" : "pointer",
                  }}
                >
-                                        Remove
-                                    </button>
-                                </div>
+                  {deletingId === addr.id ? "Deleting..." : "Delete"}
+                </Button>
              </li>
            ))}
          </ul>
--- a/frontend/src/pages/AlertHistory.jsx
+++ b/frontend/src/pages/AlertHistory.jsx
@@ -29,17 +29,15 @@ export default function AlertHistory() {
  }

  if (error) {
-        return (
-            <div style={{ padding: "2rem", color: "red" }}>Error: {error}</div>
-        );
+    return <div style={{ padding: "2rem", color: "red" }}>Error: {error}</div>;
  }

  return (
    <div style={{ maxWidth: "800px", margin: "0 auto", padding: "2rem" }}>
-            <h1>Recent Alert Events</h1>
+      <h1>Recent Alerts</h1>

      {alertEvents.length === 0 ? (
-                <p style={{ color: "#808080" }}>No alerts yet</p>
+        <p style={{ color: "#666" }}>No alerts yet</p>
      ) : (
        <ul style={{ listStyle: "none", padding: 0 }}>
          {alertEvents.map((event) => (
@@ -48,26 +46,17 @@ export default function AlertHistory() {
              style={{
                padding: "1rem",
                marginBottom: "0.75rem",
-                                border: "1px solid #444",
+                border: "1px solid #ddd",
                borderRadius: "4px",
-                                backgroundColor: "#333",
              }}
            >
-                            <div style={{ marginBottom: "0.5rem" }}>
-                                {event.message}
-                            </div>
+              <div style={{ marginBottom: "0.5rem" }}>{event.message}</div>
              {event.address_label && (
-                                <div
-                                    style={{
-                                    fontSize: "1.035rem",
-                                    color: "#808080",
-                                        marginBottom: "0.25rem",
-                                    }}
-                                >
+                <div style={{ fontSize: "0.9rem", color: "#666", marginBottom: "0.25rem" }}>
                  Address: {event.address_label}
                </div>
              )}
-                            <small style={{ color: "#b3b3b3" }}>
+              <small style={{ color: "#999" }}>
                {formatTimestamp(event.timestamp)}
              </small>
            </li>
--- a/frontend/src/pages/Alerts.jsx
+++ b/frontend/src/pages/Alerts.jsx
@@ -2,49 +2,14 @@ import { useState, useEffect } from "react";
 import AlertForm from "../components/AlertForm";
 import Button from "../components/Button";
 import { getAddresses } from "../api/addresses";
-import {
-    getAlerts,
-    createAlert,
-    updateAlertStatus,
-    deleteAlert,
-} from "../api/alerts";
+import { getAlerts, createAlert, updateAlertStatus, deleteAlert } from "../api/alerts";
 import {
  getNotificationConfig,
  updateNotificationConfig,
-    testNotificationChannels,
-    setupEmail,
-    sendEmailDigest,
+  testDiscordWebhook,
+  testSlackWebhook,
 } from "../api/notificationConfig";

-const inputStyle = {
-    width: "100%",
-    padding: "0.5rem",
-    fontSize: "0.9rem",
-    backgroundColor: "#1a1a1a",
-    border: "1px solid #444",
-    borderRadius: "4px",
-    color: "white",
-    fontFamily: "monospace",
-    boxSizing: "border-box",
-};
-
-const labelStyle = {
-    display: "block",
-    marginBottom: "0.25rem",
-    fontSize: "0.9rem",
-    color: "#ccc",
-};
-
-const helpLinkStyle = { color: "#0066cc", fontSize: "0.85rem" };
-
-const sectionStyle = {
-    marginBottom: "1.5rem",
-    padding: "1rem",
-    backgroundColor: "#2a2a2a",
-    borderRadius: "6px",
-    border: "1px solid #3a3a3a",
-};
-
 export default function Alerts() {
  const [addresses, setAddresses] = useState([]);
  const [selectedAddressId, setSelectedAddressId] = useState(null);
@@ -52,20 +17,16 @@ export default function Alerts() {
  const [loading, setLoading] = useState(true);
  const [error, setError] = useState(null);

-    // Notification config state
-    const [notificationEnabled, setNotificationEnabled] = useState(false);
-    const [discordWebhookUrl, setDiscordWebhookUrl] = useState("");
-    const [telegramBotToken, setTelegramBotToken] = useState("");
-    const [telegramChatId, setTelegramChatId] = useState("");
-    const [email, setEmail] = useState("");
-    const [slackWebhookUrl, setSlackWebhookUrl] = useState("");
+  const [notificationConfig, setNotificationConfig] = useState(null);
+  const [discordWebhookUrl, setDiscordWebhookUrl] = useState('');
+  const [slackWebhookUrl, setSlackWebhookUrl] = useState('');
+  const [emailAddress, setEmailAddress] = useState('');
+  const [notificationEnabled, setNotificationEnabled] = useState(true);
  const [notificationLoading, setNotificationLoading] = useState(false);
  const [notificationError, setNotificationError] = useState(null);
  const [notificationSuccess, setNotificationSuccess] = useState(null);
-    const [testingChannels, setTestingChannels] = useState(false);
-    const [settingUpEmail, setSettingUpEmail] = useState(false);
-    const [sendingDigest, setSendingDigest] = useState(false);
-    const [hasExistingConfig, setHasExistingConfig] = useState(false);
+  const [testingDiscord, setTestingDiscord] = useState(false);
+  const [testingSlack, setTestingSlack] = useState(false);

  useEffect(() => {
    async function fetchData() {
@@ -79,22 +40,11 @@ export default function Alerts() {
        }

        const configData = await getNotificationConfig();
-                setNotificationEnabled(
-                    configData.notification_enabled !== false,
-                );
-                setDiscordWebhookUrl(configData.discord_webhook_url || "");
-                setTelegramBotToken(configData.telegram_bot_token || "");
-                setTelegramChatId(configData.telegram_chat_id || "");
-                setEmail(configData.email || "");
-                setSlackWebhookUrl(configData.slack_webhook_url || "");
-
-                const hasSaved =
-                    !!configData.discord_webhook_url ||
-                    !!configData.telegram_bot_token ||
-                    !!configData.telegram_chat_id ||
-                    !!configData.email ||
-                    !!configData.slack_webhook_url;
-                setHasExistingConfig(hasSaved);
+        setNotificationConfig(configData);
+        setDiscordWebhookUrl(configData.discord_webhook_url || '');
+        setSlackWebhookUrl(configData.slack_webhook_url || '');
+        setEmailAddress(configData.email || '');
+        setNotificationEnabled(configData.notification_enabled !== false);
      } catch (err) {
        setError(err.message);
        console.error("Failed to fetch data:", err);
@@ -143,7 +93,7 @@ export default function Alerts() {
    try {
      const updated = await updateAlertStatus(alertId, !currentStatus);
      setAlerts((prev) =>
-                prev.map((alert) => (alert.id === alertId ? updated : alert)),
+        prev.map((alert) => (alert.id === alertId ? updated : alert))
      );
      setError(null);
    } catch (err) {
@@ -164,30 +114,22 @@ export default function Alerts() {
  }

  async function handleSaveNotificationConfig() {
-        if (hasExistingConfig) {
-            const confirmed = window.confirm(
-                "This will overwrite your previously saved notification settings. Continue?",
-            );
-            if (!confirmed) return;
-        }
-
    try {
      setNotificationLoading(true);
      setNotificationError(null);
      setNotificationSuccess(null);

      const config = {
-                notification_enabled: notificationEnabled,
        discord_webhook_url: discordWebhookUrl || null,
-                telegram_bot_token: telegramBotToken || null,
-                telegram_chat_id: telegramChatId || null,
-                email: email || null,
        slack_webhook_url: slackWebhookUrl || null,
+        email: emailAddress || null,
+        notification_enabled: notificationEnabled,
      };

-            await updateNotificationConfig(config);
-            setHasExistingConfig(true);
-            setNotificationSuccess("Notification settings saved!");
+      const updated = await updateNotificationConfig(config);
+      setNotificationConfig(updated);
+      setNotificationSuccess('Notification settings saved!');
+
      setTimeout(() => setNotificationSuccess(null), 3000);
    } catch (err) {
      setNotificationError(err.message);
@@ -197,76 +139,55 @@ export default function Alerts() {
    }
  }

-    async function handleTestChannels() {
+  async function handleTestDiscord() {
+    if (!discordWebhookUrl) {
+      setNotificationError('Please enter a Discord webhook URL first');
+      return;
+    }
+
    try {
-            setTestingChannels(true);
+      setTestingDiscord(true);
      setNotificationError(null);
      setNotificationSuccess(null);

-            const data = await testNotificationChannels();
-            const results = data.results || [];
+      const success = await testDiscordWebhook(discordWebhookUrl);

-            const failed = results.filter((r) => !r.success);
-            const succeeded = results.filter((r) => r.success);
-
-            if (failed.length === 0 && succeeded.length > 0) {
-                setNotificationSuccess(
-                    `Test sent to: ${succeeded.map((r) => r.channel).join(", ")}`,
-                );
-            } else if (failed.length > 0 && succeeded.length > 0) {
-                setNotificationSuccess(
-                    `Sent: ${succeeded.map((r) => r.channel).join(", ")}. Failed: ${failed.map((r) => `${r.channel} (${r.error})`).join(", ")}`,
-                );
-            } else if (failed.length > 0) {
-                setNotificationError(
-                    `Test failed: ${failed.map((r) => `${r.channel} (${r.error})`).join(", ")}`,
-                );
-            }
-
-            setTimeout(() => {
-                setNotificationSuccess(null);
-                setNotificationError(null);
-            }, 6000);
-        } catch (err) {
-            setNotificationError(err.message);
-        } finally {
-            setTestingChannels(false);
-        }
-    }
-
-    async function handleSetupEmail() {
-        try {
-            setSettingUpEmail(true);
-            setNotificationError(null);
-            setNotificationSuccess(null);
-
-            await handleSaveNotificationConfig();
-
-            const result = await setupEmail();
-            setNotificationSuccess(
-                result.message || "Confirmation email sent!",
-            );
+      if (success) {
+        setNotificationSuccess('Test notification sent! Check your Discord channel.');
        setTimeout(() => setNotificationSuccess(null), 5000);
+      } else {
+        setNotificationError('Test failed. Check your webhook URL.');
+      }
    } catch (err) {
-            setNotificationError(err.message);
+      setNotificationError('Test failed: ' + err.message);
    } finally {
-            setSettingUpEmail(false);
+      setTestingDiscord(false);
    }
  }

-    async function handleSendDigest() {
+  async function handleTestSlack() {
+    if (!slackWebhookUrl) {
+      setNotificationError('Please enter a Slack webhook URL first');
+      return;
+    }
+
    try {
-            setSendingDigest(true);
+      setTestingSlack(true);
      setNotificationError(null);
      setNotificationSuccess(null);

-            const result = await sendEmailDigest();
-            setNotificationSuccess(result.message || "Digest email sent!");
+      const success = await testSlackWebhook(slackWebhookUrl);
+
+      if (success) {
+        setNotificationSuccess('Test notification sent! Check your Slack channel.');
        setTimeout(() => setNotificationSuccess(null), 5000);
+      } else {
+        setNotificationError('Test failed. Check your webhook URL.');
+      }
    } catch (err) {
-            setNotificationError(err.message);
+      setNotificationError('Test failed: ' + err.message);
    } finally {
-            setSendingDigest(false);
+      setTestingSlack(false);
    }
  }

@@ -279,43 +200,28 @@ export default function Alerts() {
  if (addresses.length === 0) {
    return (
      <div style={{ padding: "2rem" }}>
-                <p>
-                    No addresses tracked yet. Add an address first to create
-                    alerts.
-                </p>
+        <p>No addresses tracked yet. Add an address first to create alerts.</p>
      </div>
    );
  }

  return (
    <div style={{ maxWidth: "1400px", margin: "0 auto", padding: "2rem" }}>
-            <h1 style={{ marginBottom: "2rem" }}>
-                Alert Rules & Notifications
-            </h1>
+      <h1 style={{ marginBottom: "2rem" }}>Alert Rules & Notifications</h1>
+
+      <div style={{ display: "grid", gridTemplateColumns: "1fr 1fr", gap: "2rem" }}>

-            <div
-                style={{
-                    display: "grid",
-                    gridTemplateColumns: "1fr 1fr",
-                    gap: "2rem",
-                    alignItems: "start",
-                }}
-            >
        {/* LEFT COLUMN: Alert Rules */}
        <div>
          <h2 style={{ marginTop: 0 }}>Alert Rules</h2>

          <div style={{ marginBottom: "2rem" }}>
-                        <label
-                            style={{ display: "block", marginBottom: "0.5rem" }}
-                        >
+            <label style={{ display: "block", marginBottom: "0.5rem" }}>
              <strong>Select Address:</strong>
            </label>
            <select
              value={selectedAddressId || ""}
-                            onChange={(e) =>
-                                setSelectedAddressId(Number(e.target.value))
-                            }
+              onChange={(e) => setSelectedAddressId(Number(e.target.value))}
              style={{
                width: "100%",
                padding: "0.5rem",
@@ -323,7 +229,7 @@ export default function Alerts() {
                backgroundColor: "#1a1a1a",
                border: "1px solid #444",
                borderRadius: "4px",
-                                color: "white",
+                color: "white"
              }}
            >
              {addresses.map((addr) => (
@@ -340,34 +246,18 @@ export default function Alerts() {
                style={{
                  padding: "1rem",
                  marginBottom: "2rem",
-                                    backgroundColor: "#333",
+                  backgroundColor: "#2a2a2a",
                  borderRadius: "4px",
-                                    border: "1px solid #444",
-                                }}
-                            >
-                                <div
-                                    style={{
-                                        fontSize: "1.035rem",
-                                        color: "#b3b3b3",
+                  border: "1px solid #444"
                }}
              >
+                <div style={{ fontSize: "0.9rem", color: "#999" }}>
                  Managing alerts for:
                </div>
-                                <div
-                                    style={{
-                                        fontWeight: "bold",
-                                        marginTop: "0.25rem",
-                                    }}
-                                >
+                <div style={{ fontWeight: "bold", marginTop: "0.25rem" }}>
                  {selectedAddress.label || "Unlabeled"}
                </div>
-                                <div
-                                    style={{
-                                        fontFamily: "monospace",
-                                        fontSize: "1.035rem",
-                                        color: "#b3b3b3",
-                                    }}
-                                >
+                <div style={{ fontFamily: "monospace", fontSize: "0.9rem", color: "#999" }}>
                  {selectedAddress.address}
                </div>
              </div>
@@ -379,23 +269,13 @@ export default function Alerts() {

              <div>
                <h3>Active Alert Rules</h3>
-                                {error && (
-                                    <p style={{ color: "red" }}>
-                                        Error: {error}
-                                    </p>
-                                )}
+                {error && <p style={{ color: "red" }}>Error: {error}</p>}
                {alerts.length === 0 ? (
                  <p style={{ color: "#666" }}>
-                                        No alert rules defined yet. Create one
-                                        above.
+                    No alert rules defined yet. Create one above.
                  </p>
                ) : (
-                                    <ul
-                                        style={{
-                                            listStyle: "none",
-                                            padding: 0,
-                                        }}
-                                    >
+                  <ul style={{ listStyle: "none", padding: 0 }}>
                    {alerts.map((alert) => (
                      <li
                        key={alert.id}
@@ -404,89 +284,37 @@ export default function Alerts() {
                          marginBottom: "0.5rem",
                          border: "1px solid #444",
                          borderRadius: "4px",
-                                                    backgroundColor: "#333",
-                                                    opacity: alert.enabled
-                                                        ? 1
-                                                        : 0.6,
+                          backgroundColor: "#2a2a2a",
+                          opacity: alert.enabled ? 1 : 0.6,
                        }}
                      >
                        <div
                          style={{
                            display: "flex",
-                                                        justifyContent:
-                                                            "space-between",
-                                                        alignItems:
-                                                            "flex-start",
+                            justifyContent: "space-between",
+                            alignItems: "flex-start",
                          }}
                        >
                          <div style={{ flex: 1 }}>
-                                                        <div
-                                                            style={{
-                                                                fontWeight:
-                                                                    "bold",
-                                                                marginBottom:
-                                                                    "0.25rem",
-                                                            }}
-                                                        >
-                                                            {formatAlertType(
-                                                                alert.type,
-                                                            )}
+                            <div style={{ fontWeight: "bold", marginBottom: "0.25rem" }}>
+                              {formatAlertType(alert.type)}
                            </div>
                            {alert.threshold && (
-                                                            <div
-                                                                style={{
-                                                                    fontSize:
-                                                                        "1.035rem",
-                                                                    color: "#b3b3b3",
-                                                                }}
-                                                            >
-                                                                Threshold:{" "}
-                                                                {
-                                                                    alert.threshold
-                                                                }{" "}
-                                                                ETH
+                              <div style={{ fontSize: "0.9rem", color: "#999" }}>
+                                Threshold: {alert.threshold} ETH
                              </div>
                            )}
-                                                        <div
-                                                            style={{
-                                                                fontSize:
-                                                                    "0.978rem",
-                                                                color: "#808080",
-                                                                marginTop:
-                                                                    "0.25rem",
-                                                            }}
-                                                        >
-                                                            Status:{" "}
-                                                            {alert.enabled
-                                                                ? "Enabled"
-                                                                : "Disabled"}
+                            <div style={{ fontSize: "0.85rem", color: "#666", marginTop: "0.25rem" }}>
+                              Status: {alert.enabled ? "Enabled" : "Disabled"}
                            </div>
                          </div>
-                                                    <div
-                                                        style={{
-                                                            display: "flex",
-                                                            gap: "0.5rem",
-                                                        }}
-                                                    >
+                          <div style={{ display: "flex", gap: "0.5rem" }}>
                            <Button
-                                                            onClick={() =>
-                                                                handleToggleAlert(
-                                                                    alert.id,
-                                                                    alert.enabled,
-                                                                )
-                                                            }
+                              onClick={() => handleToggleAlert(alert.id, alert.enabled)}
                            >
-                                                            {alert.enabled
-                                                                ? "Disable"
-                                                                : "Enable"}
+                              {alert.enabled ? "Disable" : "Enable"}
                            </Button>
-                                                        <Button
-                                                            onClick={() =>
-                                                                handleDeleteAlert(
-                                                                    alert.id,
-                                                                )
-                                                            }
-                                                        >
+                            <Button onClick={() => handleDeleteAlert(alert.id)}>
                              Delete
                            </Button>
                          </div>
@@ -505,327 +333,201 @@ export default function Alerts() {
          <h2 style={{ marginTop: 0 }}>Notification Settings</h2>

          {notificationSuccess && (
-                        <div
-                            style={{
-                                padding: "0.75rem",
-                                marginBottom: "1rem",
-                                backgroundColor: "#00ff0020",
-                                border: "1px solid #00ff00",
-                                borderRadius: "4px",
-                                color: "#00ff00",
-                            }}
-                        >
+            <div style={{
+              padding: '0.75rem',
+              marginBottom: '1rem',
+              backgroundColor: '#00ff0020',
+              border: '1px solid #00ff00',
+              borderRadius: '4px',
+              color: '#00ff00'
+            }}>
              {notificationSuccess}
            </div>
          )}

          {notificationError && (
-                        <div
-                            style={{
-                                padding: "0.75rem",
-                                marginBottom: "1rem",
-                                backgroundColor: "#ff000020",
-                                border: "1px solid #ff0000",
-                                borderRadius: "4px",
-                                color: "#ff6666",
-                            }}
-                        >
+            <div style={{
+              padding: '0.75rem',
+              marginBottom: '1rem',
+              backgroundColor: '#ff000020',
+              border: '1px solid #ff0000',
+              borderRadius: '4px',
+              color: '#ff6666'
+            }}>
              {notificationError}
            </div>
          )}

          {/* Master toggle */}
-                    <div
-                        style={{
-                            marginBottom: "1.5rem",
-                            padding: "1rem",
-                            backgroundColor: "#333",
-                            borderRadius: "4px",
-                        }}
-                    >
-                        <label
-                            style={{
-                                display: "flex",
-                                alignItems: "center",
-                                cursor: "pointer",
-                            }}
-                        >
+          <div style={{ marginBottom: '2rem', padding: '1rem', backgroundColor: '#1a1a1a', borderRadius: '4px', border: '1px solid #444' }}>
+            <label style={{ display: 'flex', alignItems: 'center', cursor: 'pointer' }}>
              <input
                type="checkbox"
                checked={notificationEnabled}
-                                onChange={(e) =>
-                                    setNotificationEnabled(e.target.checked)
-                                }
-                                style={{
-                                    marginRight: "0.5rem",
-                                    width: "18px",
-                                    height: "18px",
-                                }}
+                onChange={(e) => setNotificationEnabled(e.target.checked)}
+                style={{ marginRight: '0.5rem', width: '18px', height: '18px' }}
              />
-                            <span style={{ fontWeight: "bold" }}>
-                                Enable Notifications
-                            </span>
+              <span style={{ fontWeight: 'bold' }}>Enable Notifications</span>
            </label>
-                        <div
-                            style={{
-                                fontSize: "0.978rem",
-                                color: "#808080",
-                                marginTop: "0.5rem",
-                                marginLeft: "26px",
-                            }}
-                        >
+            <div style={{ fontSize: '0.85rem', color: '#666', marginTop: '0.5rem', marginLeft: '26px' }}>
              Master switch for all notification channels
            </div>
          </div>

-                    {/* All channel settings — hidden when master toggle is off */}
-                    <div
-                        style={{
-                            display: notificationEnabled ? "block" : "none",
-                        }}
-                    >
-                        {/* Telegram */}
-                        <div style={sectionStyle}>
-                            <h3 style={{ marginTop: 0, marginBottom: "1rem" }}>
-                                Telegram
-                            </h3>
+          {/* Discord Section */}
+          <div style={{ marginBottom: '2rem' }}>
+            <h3 style={{ marginBottom: '1rem' }}>Discord</h3>

-                            <div style={{ marginBottom: "0.75rem" }}>
-                                <label style={labelStyle}>Bot Token</label>
-                                <input
-                                    type="text"
-                                    value={telegramBotToken}
-                                    onChange={(e) =>
-                                        setTelegramBotToken(e.target.value)
-                                    }
-                                    placeholder="123456789:ABCdefGHIjklMNOpqrSTUvwxYZ"
-                                    style={inputStyle}
-                                />
-                            </div>
-
-                            <div style={{ marginBottom: "0.5rem" }}>
-                                <label style={labelStyle}>Chat ID</label>
-                                <input
-                                    type="text"
-                                    value={telegramChatId}
-                                    onChange={(e) =>
-                                        setTelegramChatId(e.target.value)
-                                    }
-                                    placeholder="-1001234567890"
-                                    style={inputStyle}
-                                />
-                            </div>
-
-                            <a
-                                href="https://core.telegram.org/bots#how-do-i-create-a-bot"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                style={helpLinkStyle}
-                            >
-                                How to create a Telegram bot & get your Chat ID
-                            </a>
-                        </div>
-
-                        {/* Email */}
-                        <div style={sectionStyle}>
-                            <h3 style={{ marginTop: 0, marginBottom: "1rem" }}>
-                                Email
-                            </h3>
-
-                            <div style={{ marginBottom: "0.75rem" }}>
-                                <label style={labelStyle}>Email Address</label>
-                                <input
-                                    type="email"
-                                    value={email}
-                                    onChange={(e) => setEmail(e.target.value)}
-                                    placeholder="you@example.com"
-                                    style={inputStyle}
-                                />
-                            </div>
-
-                            <div
-                                style={{
-                                    fontSize: "0.85rem",
-                                    color: "#808080",
-                                    marginBottom: "0.75rem",
-                                }}
-                            >
-                                Alert notifications and digests will be sent to
-                                this address
-                            </div>
-
-                            <div
-                                style={{
-                                    display: "flex",
-                                    gap: "0.5rem",
-                                }}
-                            >
-                                <button
-                                    onClick={handleSetupEmail}
-                                    disabled={settingUpEmail || !email}
-                                    style={{
-                                        padding: "0.5rem 1rem",
-                                        fontSize: "0.85rem",
-                                        backgroundColor:
-                                            settingUpEmail || !email
-                                                ? "#333"
-                                                : "#0066cc",
-                                        color: "white",
-                                        border: "none",
-                                        borderRadius: "4px",
-                                        cursor:
-                                            settingUpEmail || !email
-                                                ? "not-allowed"
-                                                : "pointer",
-                                    }}
-                                >
-                                    {settingUpEmail
-                                        ? "Setting up..."
-                                        : "Verify Email"}
-                                </button>
-
-                                <button
-                                    onClick={handleSendDigest}
-                                    disabled={sendingDigest || !email}
-                                    style={{
-                                        padding: "0.5rem 1rem",
-                                        fontSize: "0.85rem",
-                                        backgroundColor:
-                                            sendingDigest || !email
-                                                ? "#333"
-                                                : "#6c757d",
-                                        color: "white",
-                                        border: "none",
-                                        borderRadius: "4px",
-                                        cursor:
-                                            sendingDigest || !email
-                                                ? "not-allowed"
-                                                : "pointer",
-                                    }}
-                                >
-                                    {sendingDigest
-                                        ? "Sending..."
-                                        : "Send Digest Now"}
-                                </button>
-                            </div>
-                        </div>
-
-                        {/* Discord */}
-                        <div style={sectionStyle}>
-                            <h3 style={{ marginTop: 0, marginBottom: "1rem" }}>
-                                Discord
-                            </h3>
-
-                            <div style={{ marginBottom: "0.5rem" }}>
-                                <label style={labelStyle}>
-                                    Discord Webhook URL
+            <div style={{ marginBottom: '1rem' }}>
+              <label style={{ display: 'block', marginBottom: '0.5rem' }}>
+                Webhook URL
              </label>
              <input
                type="text"
                value={discordWebhookUrl}
-                                    onChange={(e) =>
-                                        setDiscordWebhookUrl(e.target.value)
-                                    }
+                onChange={(e) => setDiscordWebhookUrl(e.target.value)}
                placeholder="https://discord.com/api/webhooks/..."
-                                    style={inputStyle}
+                style={{
+                  width: '100%',
+                  padding: '0.5rem',
+                  backgroundColor: '#1a1a1a',
+                  border: '1px solid #444',
+                  borderRadius: '4px',
+                  color: 'white',
+                  fontFamily: 'monospace',
+                  fontSize: '0.9rem'
+                }}
              />
-                            </div>
-
+              <div style={{ fontSize: '0.85rem', color: '#999', marginTop: '0.5rem' }}>
                <a
                  href="https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks"
                  target="_blank"
                  rel="noopener noreferrer"
-                                style={helpLinkStyle}
+                  style={{ color: '#0066cc' }}
                >
                  How to get a Discord webhook URL
                </a>
              </div>
+            </div>

-                        {/* Slack */}
-                        <div style={sectionStyle}>
-                            <h3 style={{ marginTop: 0, marginBottom: "1rem" }}>
-                                Slack
-                            </h3>
+            <button
+              onClick={handleTestDiscord}
+              disabled={testingDiscord || !discordWebhookUrl}
+              style={{
+                padding: '0.5rem 1rem',
+                fontSize: '0.9rem',
+                backgroundColor: testingDiscord || !discordWebhookUrl ? '#333' : '#28a745',
+                color: 'white',
+                border: 'none',
+                borderRadius: '4px',
+                cursor: testingDiscord || !discordWebhookUrl ? 'not-allowed' : 'pointer'
+              }}
+            >
+              {testingDiscord ? 'Testing...' : 'Test Webhook'}
+            </button>
+          </div>

-                            <div style={{ marginBottom: "0.5rem" }}>
-                                <label style={labelStyle}>
-                                    Slack Webhook URL
+          {/* Slack Section */}
+          <div style={{ marginBottom: '2rem' }}>
+            <h3 style={{ marginBottom: '1rem' }}>Slack</h3>
+
+            <div style={{ marginBottom: '1rem' }}>
+              <label style={{ display: 'block', marginBottom: '0.5rem' }}>
+                Incoming Webhook URL
              </label>
              <input
                type="text"
                value={slackWebhookUrl}
-                                    onChange={(e) =>
-                                        setSlackWebhookUrl(e.target.value)
-                                    }
+                onChange={(e) => setSlackWebhookUrl(e.target.value)}
                placeholder="https://hooks.slack.com/services/..."
-                                    style={inputStyle}
+                style={{
+                  width: '100%',
+                  padding: '0.5rem',
+                  backgroundColor: '#1a1a1a',
+                  border: '1px solid #444',
+                  borderRadius: '4px',
+                  color: 'white',
+                  fontFamily: 'monospace',
+                  fontSize: '0.9rem'
+                }}
              />
-                            </div>
-
+              <div style={{ fontSize: '0.85rem', color: '#999', marginTop: '0.5rem' }}>
                <a
                  href="https://api.slack.com/messaging/webhooks"
                  target="_blank"
                  rel="noopener noreferrer"
-                                style={helpLinkStyle}
+                  style={{ color: '#0066cc' }}
                >
                  How to set up Slack Incoming Webhooks
                </a>
              </div>
+            </div>

-                        {/* Save & Test buttons at the bottom */}
-                        <div
+            <button
+              onClick={handleTestSlack}
+              disabled={testingSlack || !slackWebhookUrl}
              style={{
-                                display: "flex",
-                                gap: "0.75rem",
-                                marginTop: "1rem",
+                padding: '0.5rem 1rem',
+                fontSize: '0.9rem',
+                backgroundColor: testingSlack || !slackWebhookUrl ? '#333' : '#28a745',
+                color: 'white',
+                border: 'none',
+                borderRadius: '4px',
+                cursor: testingSlack || !slackWebhookUrl ? 'not-allowed' : 'pointer'
              }}
            >
+              {testingSlack ? 'Testing...' : 'Test Webhook'}
+            </button>
+          </div>
+
+          {/* Email Section */}
+          <div style={{ marginBottom: '2rem' }}>
+            <h3 style={{ marginBottom: '1rem' }}>Email</h3>
+
+            <div style={{ marginBottom: '1rem' }}>
+              <label style={{ display: 'block', marginBottom: '0.5rem' }}>
+                Email Address
+              </label>
+              <input
+                type="email"
+                value={emailAddress}
+                onChange={(e) => setEmailAddress(e.target.value)}
+                placeholder="you@example.com"
+                style={{
+                  width: '100%',
+                  padding: '0.5rem',
+                  backgroundColor: '#1a1a1a',
+                  border: '1px solid #444',
+                  borderRadius: '4px',
+                  color: 'white',
+                  fontSize: '0.9rem'
+                }}
+              />
+              <div style={{ fontSize: '0.85rem', color: '#999', marginTop: '0.5rem' }}>
+                Requires SMTP to be configured on the server
+              </div>
+            </div>
+          </div>
+
+          {/* Save Button */}
          <button
            onClick={handleSaveNotificationConfig}
            disabled={notificationLoading}
            style={{
-                                    padding: "0.75rem 1.5rem",
-                                    fontSize: "1rem",
-                                    backgroundColor: notificationLoading
-                                        ? "#333"
-                                        : "#0066cc",
-                                    color: "white",
-                                    border: "none",
-                                    borderRadius: "4px",
-                                    cursor: notificationLoading
-                                        ? "not-allowed"
-                                        : "pointer",
+              padding: '0.75rem 1.5rem',
+              fontSize: '1rem',
+              backgroundColor: notificationLoading ? '#333' : '#0066cc',
+              color: 'white',
+              border: 'none',
+              borderRadius: '4px',
+              cursor: notificationLoading ? 'not-allowed' : 'pointer',
+              width: '100%',
            }}
          >
-                                {notificationLoading
-                                    ? "Saving..."
-                                    : "Save Settings"}
+            {notificationLoading ? 'Saving...' : 'Save All Notification Settings'}
          </button>
+        </div>

-                            <button
-                                onClick={handleTestChannels}
-                                disabled={testingChannels}
-                                style={{
-                                    padding: "0.75rem 1.5rem",
-                                    fontSize: "1rem",
-                                    backgroundColor: testingChannels
-                                        ? "#333"
-                                        : "#28a745",
-                                    color: "white",
-                                    border: "none",
-                                    borderRadius: "4px",
-                                    cursor: testingChannels
-                                        ? "not-allowed"
-                                        : "pointer",
-                                }}
-                            >
-                                {testingChannels
-                                    ? "Testing..."
-                                    : "Test All Channels"}
-                            </button>
-                        </div>
-                    </div>
-                </div>
      </div>
    </div>
  );
--- a/frontend/src/pages/Login.jsx
+++ b/frontend/src/pages/Login.jsx
@@ -4,14 +4,14 @@
 * Allows existing users to sign in with email and password
 */

-import { useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
-import { useAuth } from "../contexts/AuthContext";
+import { useState } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
+import { useAuth } from '../contexts/AuthContext';

 export default function Login() {
-    const [email, setEmail] = useState("");
-    const [password, setPassword] = useState("");
-    const [error, setError] = useState("");
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [error, setError] = useState('');
  const [loading, setLoading] = useState(false);
  
  const { login } = useAuth();
@@ -22,54 +22,50 @@ export default function Login() {

    // Validation
    if (!email || !password) {
-            setError("Please fill in all fields");
+      setError('Please fill in all fields');
      return;
    }

    try {
-            setError("");
+      setError('');
      setLoading(true);
      await login(email, password);
-            navigate("/addresses"); // Redirect to main app
+      navigate('/addresses'); // Redirect to main app
    } catch (err) {
-            setError("Failed to log in: " + err.message);
+      setError('Failed to log in: ' + err.message);
    } finally {
      setLoading(false);
    }
  }

  return (
-        <div
-            style={{
-                maxWidth: "400px",
-                margin: "4rem auto",
-                padding: "2rem",
-                border: "1px solid #333",
-                borderRadius: "8px",
-            }}
-        >
-            <h1 style={{ marginBottom: "2rem", textAlign: "center" }}>
+    <div style={{ 
+      maxWidth: '400px', 
+      margin: '4rem auto', 
+      padding: '2rem',
+      border: '1px solid #333',
+      borderRadius: '8px'
+    }}>
+      <h1 style={{ marginBottom: '2rem', textAlign: 'center' }}>
        Koin Ping - Login
      </h1>

      {error && (
-                <div
-                    style={{
-                        padding: "0.75rem",
-                        marginBottom: "1rem",
-                        backgroundColor: "#ff000020",
-                        border: "1px solid #ff0000",
-                        borderRadius: "4px",
-                        color: "#ff6666",
-                    }}
-                >
+        <div style={{ 
+          padding: '0.75rem', 
+          marginBottom: '1rem', 
+          backgroundColor: '#ff000020',
+          border: '1px solid #ff0000',
+          borderRadius: '4px',
+          color: '#ff6666'
+        }}>
          {error}
        </div>
      )}

      <form onSubmit={handleSubmit}>
-                <div style={{ marginBottom: "1rem" }}>
-                    <label style={{ display: "block", marginBottom: "0.5rem" }}>
+        <div style={{ marginBottom: '1rem' }}>
+          <label style={{ display: 'block', marginBottom: '0.5rem' }}>
            Email
          </label>
          <input
@@ -78,20 +74,20 @@ export default function Login() {
            onChange={(e) => setEmail(e.target.value)}
            disabled={loading}
            style={{
-                            width: "100%",
-                            padding: "0.5rem",
-                            fontSize: "1rem",
-                            backgroundColor: "#242424",
-                            border: "1px solid #444",
-                            borderRadius: "4px",
-                            color: "white",
+              width: '100%',
+              padding: '0.5rem',
+              fontSize: '1rem',
+              backgroundColor: '#1a1a1a',
+              border: '1px solid #444',
+              borderRadius: '4px',
+              color: 'white'
            }}
            required
          />
        </div>

-                <div style={{ marginBottom: "1.5rem" }}>
-                    <label style={{ display: "block", marginBottom: "0.5rem" }}>
+        <div style={{ marginBottom: '1.5rem' }}>
+          <label style={{ display: 'block', marginBottom: '0.5rem' }}>
            Password
          </label>
          <input
@@ -100,13 +96,13 @@ export default function Login() {
            onChange={(e) => setPassword(e.target.value)}
            disabled={loading}
            style={{
-                            width: "100%",
-                            padding: "0.5rem",
-                            fontSize: "1rem",
-                            backgroundColor: "#242424",
-                            border: "1px solid #444",
-                            borderRadius: "4px",
-                            color: "white",
+              width: '100%',
+              padding: '0.5rem',
+              fontSize: '1rem',
+              backgroundColor: '#1a1a1a',
+              border: '1px solid #444',
+              borderRadius: '4px',
+              color: 'white'
            }}
            required
          />
@@ -116,26 +112,26 @@ export default function Login() {
          type="submit"
          disabled={loading}
          style={{
-                        width: "100%",
-                        padding: "0.75rem",
-                        fontSize: "1rem",
-                        backgroundColor: loading ? "#333" : "#0066cc",
-                        color: "white",
-                        border: "none",
-                        borderRadius: "4px",
-                        cursor: loading ? "not-allowed" : "pointer",
+            width: '100%',
+            padding: '0.75rem',
+            fontSize: '1rem',
+            backgroundColor: loading ? '#333' : '#0066cc',
+            color: 'white',
+            border: 'none',
+            borderRadius: '4px',
+            cursor: loading ? 'not-allowed' : 'pointer'
          }}
        >
-                    {loading ? "Logging in..." : "Log In"}
+          {loading ? 'Logging in...' : 'Log In'}
        </button>
      </form>

-            <div style={{ marginTop: "1.5rem", textAlign: "center" }}>
-                <p style={{ color: "#b3b3b3" }}>
-                    Don't have an account?{" "}
+      <div style={{ marginTop: '1.5rem', textAlign: 'center' }}>
+        <p style={{ color: '#999' }}>
+          Don't have an account?{' '}
          <Link 
            to="/signup" 
-                        style={{ color: "#0066cc", textDecoration: "none" }}
+            style={{ color: '#0066cc', textDecoration: 'none' }}
          >
            Sign up here
          </Link>
@@ -144,3 +140,4 @@ export default function Login() {
    </div>
  );
 }
+
--- a/frontend/src/pages/Onboarding.jsx
+++ b/frontend/src/pages/Onboarding.jsx
@@ -1,834 +0,0 @@
-/**
- * Onboarding Wizard
- *
- * 5-step guided flow: Create Account → Add Wallet → Alert Rules → Notifications → Done
- */
-
-import { useState, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
-import { useAuth } from "../contexts/AuthContext";
-import { createAddress, getAddresses } from "../api/addresses";
-import { createAlert } from "../api/alerts";
-import {
-    updateNotificationConfig,
-    testNotificationChannels,
-} from "../api/notificationConfig";
-
-const STEPS = [
-    "Create Account",
-    "Add Wallet",
-    "Alert Rules",
-    "Notifications",
-    "Done",
-];
-
-const inputStyle = {
-    width: "100%",
-    padding: "0.5rem",
-    fontSize: "1rem",
-    backgroundColor: "#2a2a2a",
-    border: "1px solid #444",
-    borderRadius: "4px",
-    color: "white",
-    boxSizing: "border-box",
-};
-
-const labelStyle = {
-    display: "block",
-    marginBottom: "0.4rem",
-    color: "#ccc",
-    fontSize: "0.9rem",
-};
-
-export default function Onboarding() {
-    const { currentUser, signup } = useAuth();
-    const navigate = useNavigate();
-
-    const [step, setStep] = useState(1);
-    const [loading, setLoading] = useState(false);
-    const [error, setError] = useState("");
-    const [skipWarning, setSkipWarning] = useState("");
-    const [testResults, setTestResults] = useState(null);
-    const [testLoading, setTestLoading] = useState(false);
-
-    // Wizard state
-    const [data, setData] = useState({
-        email: "",
-        password: "",
-        confirmPassword: "",
-        walletAddress: "",
-        walletLabel: "",
-        createdAddressId: null,
-        alertIncomingTx: false,
-        alertOutgoingTx: false,
-        alertLargeTransfer: false,
-        largeTransferThreshold: "",
-        alertBalanceBelow: false,
-        balanceBelowThreshold: "",
-        discordWebhookUrl: "",
-        slackWebhookUrl: "",
-        notificationEmail: "",
-        // summary
-        alertsCreated: [],
-        notificationConfigured: false,
-    });
-
-    function set(field, value) {
-        setData((prev) => ({ ...prev, [field]: value }));
-    }
-
-    // On mount: if already fully onboarded, redirect away
-    useEffect(() => {
-        if (!currentUser) return;
-        getAddresses()
-            .then((addresses) => {
-                if (addresses.length > 0) {
-                    navigate("/addresses", { replace: true });
-                }
-            })
-            .catch(() => {}); // ignore errors (e.g. mid-signup)
-    }, [currentUser, navigate]);
-
-    // ── Step handlers ─────────────────────────────────────────────────────────
-
-    async function handleStep1() {
-        setError("");
-        if (!data.email || !data.password || !data.confirmPassword) {
-            setError("Please fill in all fields");
-            return;
-        }
-        if (data.password !== data.confirmPassword) {
-            setError("Passwords do not match");
-            return;
-        }
-        if (data.password.length < 6) {
-            setError("Password must be at least 6 characters");
-            return;
-        }
-        // If user already exists (browser-close-mid-wizard), skip signup
-        if (!currentUser) {
-            try {
-                setLoading(true);
-                await signup(data.email, data.password);
-            } catch (err) {
-                if (err.code === "auth/email-already-in-use") {
-                    setError("Email already in use. Try logging in instead.");
-                } else if (err.code === "auth/invalid-email") {
-                    setError("Invalid email address");
-                } else if (err.code === "auth/weak-password") {
-                    setError("Password is too weak");
-                } else {
-                    setError("Failed to create account: " + err.message);
-                }
-                setLoading(false);
-                return;
-            } finally {
-                setLoading(false);
-            }
-        }
-        setStep(2);
-    }
-
-    async function handleStep2() {
-        setError("");
-        if (!data.walletAddress) {
-            setError("Please enter a wallet address");
-            return;
-        }
-        if (!/^0x[0-9a-fA-F]{40}$/.test(data.walletAddress)) {
-            setError("Invalid ETH address (must be 0x followed by 40 hex characters)");
-            return;
-        }
-        try {
-            setLoading(true);
-            const created = await createAddress({
-                address: data.walletAddress,
-                label: data.walletLabel || undefined,
-            });
-            set("createdAddressId", created.id);
-            setStep(3);
-        } catch (err) {
-            setError(err.message);
-        } finally {
-            setLoading(false);
-        }
-    }
-
-    async function handleStep3() {
-        setError("");
-        const rules = [];
-        if (data.alertIncomingTx) rules.push({ type: "incoming_tx" });
-        if (data.alertOutgoingTx) rules.push({ type: "outgoing_tx" });
-        if (data.alertLargeTransfer) {
-            if (!data.largeTransferThreshold) {
-                setError("Please enter a threshold for large transfers");
-                return;
-            }
-            rules.push({ type: "large_transfer", threshold: data.largeTransferThreshold });
-        }
-        if (data.alertBalanceBelow) {
-            if (!data.balanceBelowThreshold) {
-                setError("Please enter a threshold for balance below");
-                return;
-            }
-            rules.push({ type: "balance_below", threshold: data.balanceBelowThreshold });
-        }
-
-        if (rules.length === 0) {
-            setStep(4);
-            return;
-        }
-
-        try {
-            setLoading(true);
-            const created = [];
-            for (const rule of rules) {
-                const result = await createAlert(data.createdAddressId, rule);
-                created.push(result);
-            }
-            set("alertsCreated", created);
-            setStep(4);
-        } catch (err) {
-            setError(err.message);
-        } finally {
-            setLoading(false);
-        }
-    }
-
-    async function handleStep4() {
-        setError("");
-        const hasAny =
-            data.discordWebhookUrl || data.slackWebhookUrl || data.notificationEmail;
-        if (!hasAny) {
-            setStep(5);
-            return;
-        }
-        try {
-            setLoading(true);
-            await updateNotificationConfig({
-                notification_enabled: true,
-                discord_webhook_url: data.discordWebhookUrl || undefined,
-                slack_webhook_url: data.slackWebhookUrl || undefined,
-                email: data.notificationEmail || undefined,
-            });
-            set("notificationConfigured", true);
-            setStep(5);
-        } catch (err) {
-            setError(err.message);
-        } finally {
-            setLoading(false);
-        }
-    }
-
-    async function handleTestChannels() {
-        setTestLoading(true);
-        setTestResults(null);
-        try {
-            const results = await testNotificationChannels();
-            setTestResults(results);
-        } catch (err) {
-            setTestResults({ error: err.message });
-        } finally {
-            setTestLoading(false);
-        }
-    }
-
-    // ── Progress bar ──────────────────────────────────────────────────────────
-
-    function ProgressBar() {
-        return (
-            <div
-                style={{
-                    display: "flex",
-                    alignItems: "center",
-                    justifyContent: "center",
-                    marginBottom: "2rem",
-                }}
-            >
-                {STEPS.map((label, i) => {
-                    const stepNum = i + 1;
-                    const done = step > stepNum;
-                    const active = step === stepNum;
-                    return (
-                        <div
-                            key={label}
-                            style={{ display: "flex", alignItems: "center" }}
-                        >
-                            {i > 0 && (
-                                <div
-                                    style={{
-                                        width: "40px",
-                                        height: "2px",
-                                        backgroundColor: done || active ? "#0066cc" : "#444",
-                                        margin: "0 4px",
-                                    }}
-                                />
-                            )}
-                            <div style={{ textAlign: "center" }}>
-                                <div
-                                    style={{
-                                        width: "32px",
-                                        height: "32px",
-                                        borderRadius: "50%",
-                                        backgroundColor:
-                                            done ? "#0066cc" : active ? "#0066cc" : "#333",
-                                        border: active ? "2px solid #4499ff" : "2px solid transparent",
-                                        display: "flex",
-                                        alignItems: "center",
-                                        justifyContent: "center",
-                                        fontWeight: "bold",
-                                        fontSize: "0.85rem",
-                                        color: "white",
-                                        margin: "0 auto 4px",
-                                    }}
-                                >
-                                    {done ? "✓" : stepNum}
-                                </div>
-                                <div
-                                    style={{
-                                        fontSize: "0.7rem",
-                                        color: active ? "white" : "#888",
-                                        whiteSpace: "nowrap",
-                                    }}
-                                >
-                                    {label}
-                                </div>
-                            </div>
-                        </div>
-                    );
-                })}
-            </div>
-        );
-    }
-
-    // ── Step content ──────────────────────────────────────────────────────────
-
-    function Step1() {
-        return (
-            <>
-                <h2 style={{ marginBottom: "1.5rem" }}>Create your account</h2>
-                <div style={{ marginBottom: "1rem" }}>
-                    <label style={labelStyle}>Email</label>
-                    <input
-                        type="email"
-                        value={data.email}
-                        onChange={(e) => set("email", e.target.value)}
-                        disabled={loading}
-                        style={inputStyle}
-                        placeholder="you@example.com"
-                    />
-                </div>
-                <div style={{ marginBottom: "1rem" }}>
-                    <label style={labelStyle}>Password</label>
-                    <input
-                        type="password"
-                        value={data.password}
-                        onChange={(e) => set("password", e.target.value)}
-                        disabled={loading}
-                        style={inputStyle}
-                        placeholder="At least 6 characters"
-                    />
-                </div>
-                <div style={{ marginBottom: "1.5rem" }}>
-                    <label style={labelStyle}>Confirm Password</label>
-                    <input
-                        type="password"
-                        value={data.confirmPassword}
-                        onChange={(e) => set("confirmPassword", e.target.value)}
-                        disabled={loading}
-                        style={inputStyle}
-                        placeholder="Repeat your password"
-                    />
-                </div>
-            </>
-        );
-    }
-
-    function Step2() {
-        return (
-            <>
-                <h2 style={{ marginBottom: "0.5rem" }}>Add a wallet address</h2>
-                <p style={{ color: "#aaa", marginBottom: "1.5rem", fontSize: "0.9rem" }}>
-                    Enter the Ethereum address you want to monitor.
-                </p>
-                <div style={{ marginBottom: "1rem" }}>
-                    <label style={labelStyle}>ETH Address</label>
-                    <input
-                        type="text"
-                        value={data.walletAddress}
-                        onChange={(e) => set("walletAddress", e.target.value)}
-                        disabled={loading}
-                        style={inputStyle}
-                        placeholder="0x..."
-                    />
-                </div>
-                <div style={{ marginBottom: "1.5rem" }}>
-                    <label style={labelStyle}>Label (optional)</label>
-                    <input
-                        type="text"
-                        value={data.walletLabel}
-                        onChange={(e) => set("walletLabel", e.target.value)}
-                        disabled={loading}
-                        style={inputStyle}
-                        placeholder="e.g. My main wallet"
-                    />
-                </div>
-            </>
-        );
-    }
-
-    function Step3() {
-        return (
-            <>
-                <h2 style={{ marginBottom: "0.5rem" }}>Configure alert rules</h2>
-                <p style={{ color: "#aaa", marginBottom: "1.5rem", fontSize: "0.9rem" }}>
-                    Choose which events trigger notifications. You can change these later.
-                </p>
-
-                <CheckboxRow
-                    checked={data.alertIncomingTx}
-                    onChange={(v) => set("alertIncomingTx", v)}
-                    label="Incoming transaction"
-                />
-                <CheckboxRow
-                    checked={data.alertOutgoingTx}
-                    onChange={(v) => set("alertOutgoingTx", v)}
-                    label="Outgoing transaction"
-                />
-                <CheckboxRow
-                    checked={data.alertLargeTransfer}
-                    onChange={(v) => set("alertLargeTransfer", v)}
-                    label="Large transfer"
-                >
-                    {data.alertLargeTransfer && (
-                        <div style={{ marginTop: "0.5rem", marginLeft: "1.75rem" }}>
-                            <input
-                                type="number"
-                                value={data.largeTransferThreshold}
-                                onChange={(e) => set("largeTransferThreshold", e.target.value)}
-                                style={{ ...inputStyle, width: "160px" }}
-                                placeholder="Threshold (ETH)"
-                                min="0"
-                                step="0.01"
-                            />
-                        </div>
-                    )}
-                </CheckboxRow>
-                <CheckboxRow
-                    checked={data.alertBalanceBelow}
-                    onChange={(v) => set("alertBalanceBelow", v)}
-                    label="Balance below"
-                >
-                    {data.alertBalanceBelow && (
-                        <div style={{ marginTop: "0.5rem", marginLeft: "1.75rem" }}>
-                            <input
-                                type="number"
-                                value={data.balanceBelowThreshold}
-                                onChange={(e) => set("balanceBelowThreshold", e.target.value)}
-                                style={{ ...inputStyle, width: "160px" }}
-                                placeholder="Threshold (ETH)"
-                                min="0"
-                                step="0.01"
-                            />
-                        </div>
-                    )}
-                </CheckboxRow>
-            </>
-        );
-    }
-
-    function Step4() {
-        return (
-            <>
-                <h2 style={{ marginBottom: "0.5rem" }}>Set up notifications</h2>
-                <p style={{ color: "#aaa", marginBottom: "1.5rem", fontSize: "0.9rem" }}>
-                    Add at least one channel so you receive alerts. All fields are optional.
-                </p>
-
-                <div style={{ marginBottom: "1.25rem" }}>
-                    <label style={labelStyle}>
-                        Discord Webhook URL{" "}
-                        <a
-                            href="https://support.discord.com/hc/en-us/articles/228383668"
-                            target="_blank"
-                            rel="noreferrer"
-                            style={{ color: "#4499ff", fontSize: "0.8rem" }}
-                        >
-                            (how to get one)
-                        </a>
-                    </label>
-                    <input
-                        type="url"
-                        value={data.discordWebhookUrl}
-                        onChange={(e) => set("discordWebhookUrl", e.target.value)}
-                        disabled={loading}
-                        style={inputStyle}
-                        placeholder="https://discord.com/api/webhooks/..."
-                    />
-                </div>
-
-                <div style={{ marginBottom: "1.25rem" }}>
-                    <label style={labelStyle}>
-                        Slack Webhook URL{" "}
-                        <a
-                            href="https://api.slack.com/messaging/webhooks"
-                            target="_blank"
-                            rel="noreferrer"
-                            style={{ color: "#4499ff", fontSize: "0.8rem" }}
-                        >
-                            (how to get one)
-                        </a>
-                    </label>
-                    <input
-                        type="url"
-                        value={data.slackWebhookUrl}
-                        onChange={(e) => set("slackWebhookUrl", e.target.value)}
-                        disabled={loading}
-                        style={inputStyle}
-                        placeholder="https://hooks.slack.com/services/..."
-                    />
-                </div>
-
-                <div style={{ marginBottom: "1.5rem" }}>
-                    <label style={labelStyle}>Email address for alerts</label>
-                    <input
-                        type="email"
-                        value={data.notificationEmail}
-                        onChange={(e) => set("notificationEmail", e.target.value)}
-                        disabled={loading}
-                        style={inputStyle}
-                        placeholder="you@example.com"
-                    />
-                </div>
-            </>
-        );
-    }
-
-    function Step5() {
-        const alertCount = data.alertsCreated.length;
-        const hasNotif = data.notificationConfigured;
-
-        return (
-            <>
-                <h2 style={{ marginBottom: "1rem" }}>You're all set!</h2>
-
-                <div
-                    style={{
-                        backgroundColor: "#1e2e1e",
-                        border: "1px solid #2d5a2d",
-                        borderRadius: "6px",
-                        padding: "1rem 1.25rem",
-                        marginBottom: "1.5rem",
-                    }}
-                >
-                    <p style={{ margin: "0 0 0.5rem", color: "#90ee90", fontWeight: "bold" }}>
-                        Summary
-                    </p>
-                    <ul style={{ margin: 0, paddingLeft: "1.25rem", color: "#ccc", lineHeight: "1.8" }}>
-                        <li>
-                            Wallet address added:{" "}
-                            <span style={{ color: "white", fontFamily: "monospace", fontSize: "0.85rem" }}>
-                                {data.walletAddress}
-                            </span>
-                            {data.walletLabel && ` (${data.walletLabel})`}
-                        </li>
-                        <li>
-                            Alert rules configured:{" "}
-                            <span style={{ color: "white" }}>
-                                {alertCount > 0 ? `${alertCount} rule${alertCount !== 1 ? "s" : ""}` : "None (skipped)"}
-                            </span>
-                        </li>
-                        <li>
-                            Notification channels:{" "}
-                            <span style={{ color: "white" }}>
-                                {hasNotif ? "Configured" : "Not set up (skipped)"}
-                            </span>
-                        </li>
-                    </ul>
-                </div>
-
-                {hasNotif && (
-                    <div style={{ marginBottom: "1.5rem" }}>
-                        <button
-                            onClick={handleTestChannels}
-                            disabled={testLoading}
-                            style={{
-                                padding: "0.6rem 1.25rem",
-                                backgroundColor: testLoading ? "#333" : "#1a4d80",
-                                color: "white",
-                                border: "1px solid #0066cc",
-                                borderRadius: "4px",
-                                cursor: testLoading ? "not-allowed" : "pointer",
-                                fontSize: "0.9rem",
-                            }}
-                        >
-                            {testLoading ? "Testing..." : "Test All Channels"}
-                        </button>
-
-                        {testResults && (
-                            <div style={{ marginTop: "0.75rem" }}>
-                                {testResults.error ? (
-                                    <p style={{ color: "#ff6666" }}>{testResults.error}</p>
-                                ) : (
-                                    <ul style={{ listStyle: "none", padding: 0, margin: 0 }}>
-                                        {Object.entries(testResults).map(([channel, result]) => (
-                                            <li
-                                                key={channel}
-                                                style={{
-                                                    color: result.success ? "#90ee90" : "#ff6666",
-                                                    fontSize: "0.9rem",
-                                                    marginBottom: "0.25rem",
-                                                }}
-                                            >
-                                                {result.success ? "✓" : "✗"} {channel}:{" "}
-                                                {result.message || (result.success ? "OK" : "Failed")}
-                                            </li>
-                                        ))}
-                                    </ul>
-                                )}
-                            </div>
-                        )}
-                    </div>
-                )}
-
-                <button
-                    onClick={() => navigate("/addresses")}
-                    style={{
-                        padding: "0.75rem 2rem",
-                        backgroundColor: "#0066cc",
-                        color: "white",
-                        border: "none",
-                        borderRadius: "4px",
-                        cursor: "pointer",
-                        fontSize: "1rem",
-                        fontWeight: "bold",
-                    }}
-                >
-                    Go to Dashboard →
-                </button>
-            </>
-        );
-    }
-
-    // ── Shared helpers ────────────────────────────────────────────────────────
-
-    function CheckboxRow({ checked, onChange, label, children }) {
-        return (
-            <div style={{ marginBottom: "1rem" }}>
-                <label
-                    style={{
-                        display: "flex",
-                        alignItems: "center",
-                        gap: "0.6rem",
-                        cursor: "pointer",
-                        color: "#ddd",
-                    }}
-                >
-                    <input
-                        type="checkbox"
-                        checked={checked}
-                        onChange={(e) => onChange(e.target.checked)}
-                        style={{ width: "16px", height: "16px", accentColor: "#0066cc" }}
-                    />
-                    {label}
-                </label>
-                {children}
-            </div>
-        );
-    }
-
-    // ── Footer navigation ─────────────────────────────────────────────────────
-
-    function Footer() {
-        if (step === 5) return null;
-
-        const canSkip = step === 3 || step === 4;
-        const canBack = step > 1;
-
-        async function handleNext() {
-            setSkipWarning("");
-            if (step === 1) await handleStep1();
-            else if (step === 2) await handleStep2();
-            else if (step === 3) await handleStep3();
-            else if (step === 4) await handleStep4();
-        }
-
-        function handleSkip() {
-            setError("");
-            setSkipWarning("");
-            setStep((s) => s + 1);
-        }
-
-        function handleBack() {
-            setError("");
-            setSkipWarning("");
-            setStep((s) => s - 1);
-        }
-
-        return (
-            <div
-                style={{
-                    display: "flex",
-                    justifyContent: "space-between",
-                    alignItems: "center",
-                    marginTop: "1.5rem",
-                    paddingTop: "1rem",
-                    borderTop: "1px solid #333",
-                }}
-            >
-                <div>
-                    {canBack && (
-                        <button
-                            onClick={handleBack}
-                            disabled={loading}
-                            style={{
-                                padding: "0.5rem 1rem",
-                                backgroundColor: "transparent",
-                                color: "#aaa",
-                                border: "1px solid #444",
-                                borderRadius: "4px",
-                                cursor: loading ? "not-allowed" : "pointer",
-                            }}
-                        >
-                            ← Back
-                        </button>
-                    )}
-                </div>
-
-                <div style={{ display: "flex", gap: "0.75rem" }}>
-                    {canSkip && (
-                        <button
-                            onClick={handleSkip}
-                            disabled={loading}
-                            style={{
-                                padding: "0.5rem 1rem",
-                                backgroundColor: "transparent",
-                                color: "#aaa",
-                                border: "1px solid #444",
-                                borderRadius: "4px",
-                                cursor: loading ? "not-allowed" : "pointer",
-                            }}
-                        >
-                            Skip for now
-                        </button>
-                    )}
-                    <button
-                        onClick={handleNext}
-                        disabled={loading}
-                        style={{
-                            padding: "0.5rem 1.25rem",
-                            backgroundColor: loading ? "#333" : "#0066cc",
-                            color: "white",
-                            border: "none",
-                            borderRadius: "4px",
-                            cursor: loading ? "not-allowed" : "pointer",
-                            fontWeight: "bold",
-                        }}
-                    >
-                        {loading ? "Please wait..." : step === 4 ? "Finish" : "Next →"}
-                    </button>
-                </div>
-            </div>
-        );
-    }
-
-    // ── Render ────────────────────────────────────────────────────────────────
-
-    const stepContent = {
-        1: <Step1 />,
-        2: <Step2 />,
-        3: <Step3 />,
-        4: <Step4 />,
-        5: <Step5 />,
-    };
-
-    return (
-        <div
-            style={{
-                minHeight: "100vh",
-                backgroundColor: "#1a1a1a",
-                display: "flex",
-                flexDirection: "column",
-                alignItems: "center",
-                justifyContent: "flex-start",
-                paddingTop: "3rem",
-                paddingBottom: "3rem",
-            }}
-        >
-            <div style={{ width: "100%", maxWidth: "540px", padding: "0 1rem" }}>
-                <h1
-                    style={{
-                        textAlign: "center",
-                        marginBottom: "2rem",
-                        color: "#0066cc",
-                        letterSpacing: "0.5px",
-                    }}
-                >
-                    Koin Ping
-                </h1>
-
-                <ProgressBar />
-
-                {error && (
-                    <div
-                        style={{
-                            padding: "0.75rem 1rem",
-                            marginBottom: "1rem",
-                            backgroundColor: "#3a1a1a",
-                            border: "1px solid #cc3333",
-                            borderRadius: "4px",
-                            color: "#ff6666",
-                            fontSize: "0.9rem",
-                        }}
-                    >
-                        {error}
-                    </div>
-                )}
-
-                {skipWarning && (
-                    <div
-                        style={{
-                            padding: "0.75rem 1rem",
-                            marginBottom: "1rem",
-                            backgroundColor: "#3a2e00",
-                            border: "1px solid #aa7700",
-                            borderRadius: "4px",
-                            color: "#ffcc44",
-                            fontSize: "0.9rem",
-                        }}
-                    >
-                        {skipWarning}
-                    </div>
-                )}
-
-                <div
-                    style={{
-                        backgroundColor: "#242424",
-                        border: "1px solid #333",
-                        borderRadius: "8px",
-                        padding: "2rem",
-                    }}
-                >
-                    {stepContent[step]}
-                    <Footer />
-                </div>
-
-                {step === 1 && (
-                    <p
-                        style={{
-                            textAlign: "center",
-                            marginTop: "1.25rem",
-                            color: "#888",
-                            fontSize: "0.9rem",
-                        }}
-                    >
-                        Already have an account?{" "}
-                        <a href="/login" style={{ color: "#0066cc" }}>
-                            Log in here
-                        </a>
-                    </p>
-                )}
-            </div>
-        </div>
-    );
-}
--- a/frontend/src/pages/Signup.jsx
+++ b/frontend/src/pages/Signup.jsx
@@ -1,5 +1,185 @@
-import { Navigate } from "react-router-dom";
+/**
+ * Signup Page
+ * 
+ * Allows new users to create an account with email and password
+ */
+
+import { useState } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
+import { useAuth } from '../contexts/AuthContext';

 export default function Signup() {
-    return <Navigate to="/onboarding" replace />;
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  const [error, setError] = useState('');
+  const [loading, setLoading] = useState(false);
+  
+  const { signup } = useAuth();
+  const navigate = useNavigate();
+
+  async function handleSubmit(e) {
+    e.preventDefault();
+
+    // Validation
+    if (!email || !password || !confirmPassword) {
+      setError('Please fill in all fields');
+      return;
    }
+
+    if (password !== confirmPassword) {
+      setError('Passwords do not match');
+      return;
+    }
+
+    if (password.length < 6) {
+      setError('Password must be at least 6 characters');
+      return;
+    }
+
+    try {
+      setError('');
+      setLoading(true);
+      await signup(email, password);
+      navigate('/addresses'); // Auto-login and redirect
+    } catch (err) {
+      // Firebase-specific error messages
+      if (err.code === 'auth/email-already-in-use') {
+        setError('Email already in use. Try logging in instead.');
+      } else if (err.code === 'auth/invalid-email') {
+        setError('Invalid email address');
+      } else if (err.code === 'auth/weak-password') {
+        setError('Password is too weak');
+      } else {
+        setError('Failed to create account: ' + err.message);
+      }
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  return (
+    <div style={{ 
+      maxWidth: '400px', 
+      margin: '4rem auto', 
+      padding: '2rem',
+      border: '1px solid #333',
+      borderRadius: '8px'
+    }}>
+      <h1 style={{ marginBottom: '2rem', textAlign: 'center' }}>
+        Koin Ping - Sign Up
+      </h1>
+
+      {error && (
+        <div style={{ 
+          padding: '0.75rem', 
+          marginBottom: '1rem', 
+          backgroundColor: '#ff000020',
+          border: '1px solid #ff0000',
+          borderRadius: '4px',
+          color: '#ff6666'
+        }}>
+          {error}
+        </div>
+      )}
+
+      <form onSubmit={handleSubmit}>
+        <div style={{ marginBottom: '1rem' }}>
+          <label style={{ display: 'block', marginBottom: '0.5rem' }}>
+            Email
+          </label>
+          <input
+            type="email"
+            value={email}
+            onChange={(e) => setEmail(e.target.value)}
+            disabled={loading}
+            style={{
+              width: '100%',
+              padding: '0.5rem',
+              fontSize: '1rem',
+              backgroundColor: '#1a1a1a',
+              border: '1px solid #444',
+              borderRadius: '4px',
+              color: 'white'
+            }}
+            required
+          />
+        </div>
+
+        <div style={{ marginBottom: '1rem' }}>
+          <label style={{ display: 'block', marginBottom: '0.5rem' }}>
+            Password
+          </label>
+          <input
+            type="password"
+            value={password}
+            onChange={(e) => setPassword(e.target.value)}
+            disabled={loading}
+            style={{
+              width: '100%',
+              padding: '0.5rem',
+              fontSize: '1rem',
+              backgroundColor: '#1a1a1a',
+              border: '1px solid #444',
+              borderRadius: '4px',
+              color: 'white'
+            }}
+            required
+          />
+        </div>
+
+        <div style={{ marginBottom: '1.5rem' }}>
+          <label style={{ display: 'block', marginBottom: '0.5rem' }}>
+            Confirm Password
+          </label>
+          <input
+            type="password"
+            value={confirmPassword}
+            onChange={(e) => setConfirmPassword(e.target.value)}
+            disabled={loading}
+            style={{
+              width: '100%',
+              padding: '0.5rem',
+              fontSize: '1rem',
+              backgroundColor: '#1a1a1a',
+              border: '1px solid #444',
+              borderRadius: '4px',
+              color: 'white'
+            }}
+            required
+          />
+        </div>
+
+        <button
+          type="submit"
+          disabled={loading}
+          style={{
+            width: '100%',
+            padding: '0.75rem',
+            fontSize: '1rem',
+            backgroundColor: loading ? '#333' : '#0066cc',
+            color: 'white',
+            border: 'none',
+            borderRadius: '4px',
+            cursor: loading ? 'not-allowed' : 'pointer'
+          }}
+        >
+          {loading ? 'Creating account...' : 'Sign Up'}
+        </button>
+      </form>
+
+      <div style={{ marginTop: '1.5rem', textAlign: 'center' }}>
+        <p style={{ color: '#999' }}>
+          Already have an account?{' '}
+          <Link 
+            to="/login" 
+            style={{ color: '#0066cc', textDecoration: 'none' }}
+          >
+            Log in here
+          </Link>
+        </p>
+      </div>
+    </div>
+  );
+}
+
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -22,3 +22,4 @@
  },
  "include": ["src"]
 }
+
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -1,5 +1,5 @@
-import { defineConfig } from "vite";
-import react from "@vitejs/plugin-react";
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'

 // https://vitejs.dev/config/
 export default defineConfig({
@@ -7,10 +7,11 @@ export default defineConfig({
  server: {
    port: 3000,
    proxy: {
-            "/v1": {
-                target: "http://localhost:3001",
+      '/v1': {
+        target: 'http://localhost:3001',
        changeOrigin: true,
      },
    },
  },
-});
+})
+