updated evaluator service - added semaphore.Weighted(5) and sync.WaitGroup etc to cap conncurrent requests; also WaitForNotifications() so caller blocks until notifications finish. jsonrpc.go -- finally, bumped rpcRetryBaseMS from 1000 to 2000 - RPC retries at 2s/4s/8s backoff rate

Stripe 2

backend-go/README.md

@@ -2,7 +2,6 @@ Start DB:
 
 brew services start postgresql@15
 
-
 From the backend-go directory, you have a few options:
 
 Option 1: Single command (both API + poller)

backend-go/cmd/api/main.go

@@ -61,8 +61,15 @@ func main() {
 	notifConfigHandler := handlers.NewNotificationConfigHandler(notifConfigModel, cfg)
 	emailDigestHandler := handlers.NewEmailDigestHandler(emailDigestSvc, notifConfigModel)
 	statusHandler := handlers.NewStatusHandler(checkpointModel)
+	stripeHandler := handlers.NewStripeHandler(userModel, cfg)
 
 	authenticate := middleware.Authenticate(userModel)
+	requireSub := middleware.RequireSubscription(userModel)
+
+	// authAndSub chains authentication + subscription check for protected routes.
+	authAndSub := func(h http.Handler) http.Handler {
+		return authenticate(requireSub(h))
+	}
 
 	mux := http.NewServeMux()
 	b := cfg.APIBasePath // e.g. "/v1"
@@ -71,45 +78,56 @@ func main() {
 	mux.HandleFunc("GET "+b+"/health", handlers.HealthCheck)
 	mux.HandleFunc("GET "+b+"/status", statusHandler.GetStatus)
 
-	// Authenticated routes — addresses
+	// Stripe webhook (public — called by Stripe, not authenticated)
+	mux.HandleFunc("POST "+b+"/stripe/webhook", stripeHandler.HandleWebhook)
+
+	// Stripe routes (auth required, NO subscription required)
+	mux.Handle("POST "+b+"/stripe/create-checkout-session",
+		authenticate(http.HandlerFunc(stripeHandler.CreateCheckoutSession)))
+	mux.Handle("GET "+b+"/stripe/subscription-status",
+		authenticate(http.HandlerFunc(stripeHandler.GetSubscriptionStatus)))
+	mux.Handle("POST "+b+"/stripe/verify-checkout",
+		authenticate(http.HandlerFunc(stripeHandler.VerifyCheckoutSession)))
+
+	// Authenticated + subscribed routes — addresses
 	mux.Handle("POST "+b+"/addresses",
-		authenticate(http.HandlerFunc(addressHandler.Create)))
+		authAndSub(http.HandlerFunc(addressHandler.Create)))
 	mux.Handle("GET "+b+"/addresses",
-		authenticate(http.HandlerFunc(addressHandler.List)))
+		authAndSub(http.HandlerFunc(addressHandler.List)))
 	mux.Handle("DELETE "+b+"/addresses/{addressId}",
-		authenticate(http.HandlerFunc(addressHandler.Remove)))
+		authAndSub(http.HandlerFunc(addressHandler.Remove)))
 	mux.Handle("PATCH "+b+"/addresses/{addressId}",
-		authenticate(http.HandlerFunc(addressHandler.UpdateLabel)))
+		authAndSub(http.HandlerFunc(addressHandler.UpdateLabel)))
 
-	// Authenticated routes for alert rules
+	// Authenticated + subscribed routes — alert rules
 	mux.Handle("POST "+b+"/addresses/{addressId}/alerts",
-		authenticate(http.HandlerFunc(alertRuleHandler.Create)))
+		authAndSub(http.HandlerFunc(alertRuleHandler.Create)))
 	mux.Handle("GET "+b+"/addresses/{addressId}/alerts",
-		authenticate(http.HandlerFunc(alertRuleHandler.ListByAddress)))
+		authAndSub(http.HandlerFunc(alertRuleHandler.ListByAddress)))
 	mux.Handle("PATCH "+b+"/alerts/{alertId}",
-		authenticate(http.HandlerFunc(alertRuleHandler.UpdateStatus)))
+		authAndSub(http.HandlerFunc(alertRuleHandler.UpdateStatus)))
 	mux.Handle("DELETE "+b+"/alerts/{alertId}",
-		authenticate(http.HandlerFunc(alertRuleHandler.Remove)))
+		authAndSub(http.HandlerFunc(alertRuleHandler.Remove)))
 
-	// Authenticated routes — alert events
+	// Authenticated + subscribed routes — alert events
 	mux.Handle("GET "+b+"/alert-events",
-		authenticate(http.HandlerFunc(alertEventHandler.List)))
+		authAndSub(http.HandlerFunc(alertEventHandler.List)))
 
-	// Authenticated routes — notification config
+	// Authenticated + subscribed routes — notification config
 	mux.Handle("GET "+b+"/notification-config",
-		authenticate(http.HandlerFunc(notifConfigHandler.GetConfig)))
+		authAndSub(http.HandlerFunc(notifConfigHandler.GetConfig)))
 	mux.Handle("PUT "+b+"/notification-config",
-		authenticate(http.HandlerFunc(notifConfigHandler.UpdateConfig)))
+		authAndSub(http.HandlerFunc(notifConfigHandler.UpdateConfig)))
 	mux.Handle("DELETE "+b+"/notification-config",
-		authenticate(http.HandlerFunc(notifConfigHandler.DeleteConfig)))
+		authAndSub(http.HandlerFunc(notifConfigHandler.DeleteConfig)))
 	mux.Handle("POST "+b+"/notification-config/test",
-		authenticate(http.HandlerFunc(notifConfigHandler.TestChannels)))
+		authAndSub(http.HandlerFunc(notifConfigHandler.TestChannels)))
 
-	// Authenticated routes — email digest
+	// Authenticated + subscribed routes — email digest
 	mux.Handle("POST "+b+"/email/setup",
-		authenticate(http.HandlerFunc(emailDigestHandler.SetupEmail)))
+		authAndSub(http.HandlerFunc(emailDigestHandler.SetupEmail)))
 	mux.Handle("POST "+b+"/email/digest",
-		authenticate(http.HandlerFunc(emailDigestHandler.SendDigest)))
+		authAndSub(http.HandlerFunc(emailDigestHandler.SendDigest)))
 
 	handler := corsMiddleware(mux)
 

backend-go/cmd/poller/main.go

@@ -138,6 +138,8 @@ func runCycle(
 		return
 	}
 
+	evaluator.WaitForNotifications()
+
 	duration := time.Since(startTime)
 	log.Printf("[%s] Cycle complete: %d observations, %d alerts fired in %s",
 		time.Now().UTC().Format(time.RFC3339),

backend-go/go.mod

@@ -44,6 +44,7 @@ require (
 	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
+	github.com/stripe/stripe-go/v82 v82.5.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect

backend-go/go.sum

@@ -101,6 +101,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stripe/stripe-go/v82 v82.5.1 h1:05q6ZDKoe8PLMpQV072obF74HCgP4XJeJYoNuRSX2+8=
+github.com/stripe/stripe-go/v82 v82.5.1/go.mod h1:majCQX6AfObAvJiHraPi/5udwHi4ojRvJnnxckvHrX8=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=

backend-go/infra/migrations/007_add_stripe_to_users.sql

@@ -0,0 +1,8 @@
+-- Migration 007: Add Stripe subscription fields to users table
+
+ALTER TABLE users ADD COLUMN IF NOT EXISTS stripe_customer_id VARCHAR(255);
+ALTER TABLE users ADD COLUMN IF NOT EXISTS stripe_subscription_id VARCHAR(255);
+ALTER TABLE users ADD COLUMN IF NOT EXISTS subscription_status VARCHAR(50) DEFAULT 'none';
+ALTER TABLE users ADD COLUMN IF NOT EXISTS subscription_created_at TIMESTAMP;
+
+CREATE INDEX IF NOT EXISTS idx_users_stripe_customer_id ON users(stripe_customer_id);

backend-go/infra/schema.sql

@@ -11,6 +11,10 @@ CREATE TABLE users (
   firebase_uid VARCHAR(128) NOT NULL UNIQUE,
   email VARCHAR(255) NOT NULL,
   display_name VARCHAR(255),
+  stripe_customer_id VARCHAR(255),
+  stripe_subscription_id VARCHAR(255),
+  subscription_status VARCHAR(50) DEFAULT 'none',
+  subscription_created_at TIMESTAMP,
   created_at TIMESTAMP DEFAULT NOW(),
   updated_at TIMESTAMP DEFAULT NOW()
 );
@@ -73,6 +77,7 @@ CREATE TABLE user_notification_configs (
 
 -- Create indexes for common queries
 CREATE INDEX idx_users_firebase_uid ON users(firebase_uid);
+CREATE INDEX idx_users_stripe_customer_id ON users(stripe_customer_id);
 CREATE INDEX idx_addresses_user_id ON addresses(user_id);
 CREATE INDEX idx_alert_rules_address_id ON alert_rules(address_id);
 CREATE INDEX idx_alert_rules_enabled ON alert_rules(enabled);

backend-go/internal/config/config.go

@@ -32,6 +32,11 @@ type Config struct {
 	ResendAPIKey         string
 	EmailFrom            string
 	DigestIntervalHours  int
+	StripeSecretKey      string
+	StripeWebhookSecret  string
+	StripePriceID        string
+	StripePublishableKey string
+	FrontendURL          string
 }
 
 // Load reads configuration from environment variables and returns a Config.
@@ -52,6 +57,11 @@ func Load() (*Config, error) {
 		ResendAPIKey:        os.Getenv("RESEND_API_KEY"),
 		EmailFrom:           getEnv("EMAIL_FROM", "Koin Ping <alerts@koinping.com>"),
 		DigestIntervalHours:  getEnvInt("DIGEST_INTERVAL_HOURS", defaultDigestIntervalHours),
+		StripeSecretKey:      os.Getenv("STRIPE_SECRET_KEY"),
+		StripeWebhookSecret:  os.Getenv("STRIPE_WEBHOOK_SECRET"),
+		StripePriceID:        os.Getenv("STRIPE_PRICE_ID"),
+		StripePublishableKey: os.Getenv("STRIPE_PUBLISHABLE_KEY"),
+		FrontendURL:          getEnv("FRONTEND_URL", "http://localhost:3000"),
 	}
 
 	if cfg.PollIntervalMS < minPollIntervalMS {

backend-go/internal/domain/types.go

@@ -7,6 +7,10 @@ type User struct {
 	FirebaseUID           string     `json:"-"`
 	Email                 string     `json:"email"`
 	DisplayName           *string    `json:"display_name"`           //nolint:tagliatelle
+	StripeCustomerID      *string    `json:"-"`
+	StripeSubscriptionID  *string    `json:"-"`
+	SubscriptionStatus    string     `json:"subscription_status"`    //nolint:tagliatelle
+	SubscriptionCreatedAt *time.Time `json:"subscription_created_at,omitempty"` //nolint:tagliatelle
 	CreatedAt             time.Time  `json:"created_at"`             //nolint:tagliatelle
 	UpdatedAt             time.Time  `json:"updated_at"`             //nolint:tagliatelle
 }

backend-go/internal/handlers/stripe.go

@@ -0,0 +1,254 @@
+package handlers
+
+import (
+	"encoding/json"
+	"io"
+	"log"
+	"net/http"
+
+	"github.com/stripe/stripe-go/v82"
+	checkoutsession "github.com/stripe/stripe-go/v82/checkout/session"
+	"github.com/stripe/stripe-go/v82/webhook"
+
+	"github.com/kjannette/koin-ping/backend-go/internal/config"
+	"github.com/kjannette/koin-ping/backend-go/internal/middleware"
+	"github.com/kjannette/koin-ping/backend-go/internal/models"
+)
+
+const webhookMaxBodyBytes = 65536
+
+type StripeHandler struct {
+	users *models.UserModel
+	cfg   *config.Config
+}
+
+func NewStripeHandler(users *models.UserModel, cfg *config.Config) *StripeHandler {
+	stripe.Key = cfg.StripeSecretKey
+	return &StripeHandler{users: users, cfg: cfg}
+}
+
+// CreateCheckoutSession creates a Stripe Checkout session for the monthly subscription.
+func (h *StripeHandler) CreateCheckoutSession(w http.ResponseWriter, r *http.Request) {
+	userID := middleware.GetUserID(r.Context())
+
+	user, err := h.users.GetByID(r.Context(), userID)
+	if err != nil || user == nil {
+		log.Printf("Failed to get user %s: %v", userID, err)
+		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to load user")
+		return
+	}
+
+	params := &stripe.CheckoutSessionParams{
+		Mode: stripe.String(string(stripe.CheckoutSessionModeSubscription)),
+		LineItems: []*stripe.CheckoutSessionLineItemParams{
+			{
+				Price:    stripe.String(h.cfg.StripePriceID),
+				Quantity: stripe.Int64(1),
+			},
+		},
+		SuccessURL:        stripe.String(h.cfg.FrontendURL + "/subscribe?payment=success&session_id={CHECKOUT_SESSION_ID}"),
+		CancelURL:         stripe.String(h.cfg.FrontendURL + "/subscribe?payment=cancelled"),
+		ClientReferenceID: stripe.String(userID),
+		CustomerEmail:     stripe.String(user.Email),
+	}
+
+	if user.StripeCustomerID != nil && *user.StripeCustomerID != "" {
+		params.Customer = user.StripeCustomerID
+		params.CustomerEmail = nil
+	}
+
+	s, err := checkoutsession.New(params)
+	if err != nil {
+		log.Printf("Failed to create Stripe checkout session: %v", err)
+		writeError(w, http.StatusInternalServerError, "STRIPE_ERROR", "Failed to create checkout session")
+		return
+	}
+
+	writeJSON(w, http.StatusOK, map[string]string{"url": s.URL})
+}
+
+// GetSubscriptionStatus returns the current user's subscription state.
+func (h *StripeHandler) GetSubscriptionStatus(w http.ResponseWriter, r *http.Request) {
+	userID := middleware.GetUserID(r.Context())
+
+	user, err := h.users.GetByID(r.Context(), userID)
+	if err != nil || user == nil {
+		log.Printf("Failed to get user %s: %v", userID, err)
+		writeError(w, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to load user")
+		return
+	}
+
+	writeJSON(w, http.StatusOK, map[string]any{
+		"subscription_status":     user.SubscriptionStatus,
+		"subscription_created_at": user.SubscriptionCreatedAt,
+	})
+}
+
+// VerifyCheckoutSession retrieves a completed checkout session from Stripe,
+// confirms payment, and activates the user's subscription in the database.
+// This is the primary activation path; webhooks serve as a backup.
+func (h *StripeHandler) VerifyCheckoutSession(w http.ResponseWriter, r *http.Request) {
+	userID := middleware.GetUserID(r.Context())
+
+	var body struct {
+		SessionID string `json:"session_id"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil || body.SessionID == "" {
+		writeError(w, http.StatusBadRequest, "BAD_REQUEST", "Missing session_id")
+		return
+	}
+
+	s, err := checkoutsession.Get(body.SessionID, nil)
+	if err != nil {
+		log.Printf("Failed to retrieve checkout session %s: %v", body.SessionID, err)
+		writeError(w, http.StatusBadRequest, "STRIPE_ERROR", "Invalid checkout session")
+		return
+	}
+
+	if s.ClientReferenceID != userID {
+		writeError(w, http.StatusForbidden, "FORBIDDEN", "Session does not belong to this user")
+		return
+	}
+
+	if s.PaymentStatus != stripe.CheckoutSessionPaymentStatusPaid {
+		writeError(w, http.StatusBadRequest, "PAYMENT_INCOMPLETE", "Payment has not been completed")
+		return
+	}
+
+	customerID := ""
+	if s.Customer != nil {
+		customerID = s.Customer.ID
+	}
+	subscriptionID := ""
+	if s.Subscription != nil {
+		subscriptionID = s.Subscription.ID
+	}
+
+	if customerID != "" {
+		if err := h.users.UpdateStripeCustomer(r.Context(), userID, customerID); err != nil {
+			log.Printf("VerifyCheckout: failed to save customer ID: %v", err)
+		}
+	}
+	if subscriptionID != "" && customerID != "" {
+		if err := h.users.ActivateSubscription(r.Context(), customerID, subscriptionID, "active"); err != nil {
+			log.Printf("VerifyCheckout: failed to activate subscription: %v", err)
+		}
+	}
+
+	log.Printf("Checkout verified for user %s, customer %s, subscription %s", userID, customerID, subscriptionID)
+	writeJSON(w, http.StatusOK, map[string]string{"subscription_status": "active"})
+}
+
+// HandleWebhook processes incoming Stripe webhook events.
+// This endpoint must NOT require authentication (Stripe calls it directly).
+func (h *StripeHandler) HandleWebhook(w http.ResponseWriter, r *http.Request) {
+	payload, err := io.ReadAll(io.LimitReader(r.Body, webhookMaxBodyBytes))
+	if err != nil {
+		log.Printf("Error reading webhook body: %v", err)
+		w.WriteHeader(http.StatusServiceUnavailable)
+		return
+	}
+
+	sig := r.Header.Get("Stripe-Signature")
+	event, err := webhook.ConstructEvent(payload, sig, h.cfg.StripeWebhookSecret)
+	if err != nil {
+		log.Printf("Webhook signature verification failed: %v", err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	switch event.Type {
+	case "checkout.session.completed":
+		h.handleCheckoutCompleted(r, event)
+	case "customer.subscription.updated":
+		h.handleSubscriptionUpdated(r, event)
+	case "customer.subscription.deleted":
+		h.handleSubscriptionDeleted(r, event)
+	default:
+		log.Printf("Unhandled Stripe event type: %s", event.Type)
+	}
+
+	w.WriteHeader(http.StatusOK)
+}
+
+func (h *StripeHandler) handleCheckoutCompleted(r *http.Request, event stripe.Event) {
+	var session stripe.CheckoutSession
+	if err := json.Unmarshal(event.Data.Raw, &session); err != nil {
+		log.Printf("Error parsing checkout session: %v", err)
+		return
+	}
+
+	userID := session.ClientReferenceID
+	if userID == "" {
+		log.Println("Checkout session missing client_reference_id")
+		return
+	}
+
+	customerID := ""
+	if session.Customer != nil {
+		customerID = session.Customer.ID
+	}
+	subscriptionID := ""
+	if session.Subscription != nil {
+		subscriptionID = session.Subscription.ID
+	}
+
+	if customerID != "" {
+		if err := h.users.UpdateStripeCustomer(r.Context(), userID, customerID); err != nil {
+			log.Printf("Failed to save Stripe customer ID: %v", err)
+		}
+	}
+
+	if subscriptionID != "" && customerID != "" {
+		if err := h.users.ActivateSubscription(r.Context(), customerID, subscriptionID, "active"); err != nil {
+			log.Printf("Failed to activate subscription: %v", err)
+		}
+	}
+
+	log.Printf("Checkout completed for user %s, customer %s, subscription %s", userID, customerID, subscriptionID)
+}
+
+func (h *StripeHandler) handleSubscriptionUpdated(r *http.Request, event stripe.Event) {
+	var sub stripe.Subscription
+	if err := json.Unmarshal(event.Data.Raw, &sub); err != nil {
+		log.Printf("Error parsing subscription update: %v", err)
+		return
+	}
+
+	customerID := ""
+	if sub.Customer != nil {
+		customerID = sub.Customer.ID
+	}
+	if customerID == "" {
+		return
+	}
+
+	status := string(sub.Status)
+	if err := h.users.ActivateSubscription(r.Context(), customerID, sub.ID, status); err != nil {
+		log.Printf("Failed to update subscription status: %v", err)
+	}
+
+	log.Printf("Subscription %s updated to %s for customer %s", sub.ID, status, customerID)
+}
+
+func (h *StripeHandler) handleSubscriptionDeleted(r *http.Request, event stripe.Event) {
+	var sub stripe.Subscription
+	if err := json.Unmarshal(event.Data.Raw, &sub); err != nil {
+		log.Printf("Error parsing subscription deletion: %v", err)
+		return
+	}
+
+	customerID := ""
+	if sub.Customer != nil {
+		customerID = sub.Customer.ID
+	}
+	if customerID == "" {
+		return
+	}
+
+	if err := h.users.UpdateSubscriptionStatus(r.Context(), customerID, "canceled"); err != nil {
+		log.Printf("Failed to mark subscription canceled: %v", err)
+	}
+
+	log.Printf("Subscription canceled for customer %s", customerID)
+}

backend-go/internal/middleware/auth.go

@@ -100,6 +100,43 @@ func Authenticate(userModel *models.UserModel) func(http.Handler) http.Handler {
 	}
 }
 
+// RequireSubscription blocks requests from users without an active subscription.
+// Must be applied after Authenticate.
+func RequireSubscription(userModel *models.UserModel) func(http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			userID := GetUserID(r.Context())
+			if userID == "" {
+				writeJSON(w, http.StatusUnauthorized, errorResponse{
+					Error:   "UNAUTHORIZED",
+					Message: "Authentication required",
+				})
+				return
+			}
+
+			user, err := userModel.GetByID(r.Context(), userID)
+			if err != nil || user == nil {
+				log.Printf("RequireSubscription: failed to load user %s: %v", userID, err)
+				writeJSON(w, http.StatusInternalServerError, errorResponse{
+					Error:   "INTERNAL_ERROR",
+					Message: "Failed to verify subscription",
+				})
+				return
+			}
+
+			if user.SubscriptionStatus != "active" && user.SubscriptionStatus != "trialing" {
+				writeJSON(w, http.StatusForbidden, errorResponse{
+					Error:   "SUBSCRIPTION_REQUIRED",
+					Message: "An active subscription is required to use this feature",
+				})
+				return
+			}
+
+			next.ServeHTTP(w, r)
+		})
+	}
+}
+
 func GetUserID(ctx context.Context) string {
 	if v, ok := ctx.Value(UserIDKey).(string); ok {
 		return v

backend-go/internal/models/user.go

@@ -17,37 +17,73 @@ func NewUserModel(pool *pgxpool.Pool) *UserModel {
 	return &UserModel{pool: pool}
 }
 
-// FindOrCreateByFirebaseUID returns the local user for a Firebase UID,
-// creating one if it doesn't exist yet. On conflict (returning user) the
-// updated_at timestamp is refreshed.
-func (m *UserModel) FindOrCreateByFirebaseUID(ctx context.Context, firebaseUID, email string) (*domain.User, error) {
+const userColumns = `id, firebase_uid, email, display_name,
+	stripe_customer_id, stripe_subscription_id, subscription_status,
+	subscription_created_at, created_at, updated_at`
+
+func scanUser(row pgx.Row) (*domain.User, error) {
 	var u domain.User
-	err := m.pool.QueryRow(ctx,
-		`INSERT INTO users (firebase_uid, email)
-		 VALUES ($1, $2)
-		 ON CONFLICT (firebase_uid) DO UPDATE SET updated_at = NOW()
-		 RETURNING id, firebase_uid, email, display_name, created_at, updated_at`,
-		firebaseUID, email,
-	).Scan(&u.ID, &u.FirebaseUID, &u.Email, &u.DisplayName, &u.CreatedAt, &u.UpdatedAt)
+	err := row.Scan(
+		&u.ID, &u.FirebaseUID, &u.Email, &u.DisplayName,
+		&u.StripeCustomerID, &u.StripeSubscriptionID, &u.SubscriptionStatus,
+		&u.SubscriptionCreatedAt, &u.CreatedAt, &u.UpdatedAt,
+	)
 	if err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, nil //nolint:nilnil
+		}
 		return nil, err
 	}
 	return &u, nil
 }
 
+// FindOrCreateByFirebaseUID returns the local user for a Firebase UID,
+// creating one if it doesn't exist yet. On conflict (returning user) the
+// updated_at timestamp is refreshed.
+func (m *UserModel) FindOrCreateByFirebaseUID(ctx context.Context, firebaseUID, email string) (*domain.User, error) {
+	row := m.pool.QueryRow(ctx,
+		`INSERT INTO users (firebase_uid, email)
+		 VALUES ($1, $2)
+		 ON CONFLICT (firebase_uid) DO UPDATE SET updated_at = NOW()
+		 RETURNING `+userColumns,
+		firebaseUID, email,
+	)
+	return scanUser(row)
+}
+
 func (m *UserModel) GetByID(ctx context.Context, id string) (*domain.User, error) {
-	var u domain.User
-	err := m.pool.QueryRow(ctx,
-		`SELECT id, firebase_uid, email, display_name, created_at, updated_at
-		 FROM users
-		 WHERE id = $1`,
-		id,
-	).Scan(&u.ID, &u.FirebaseUID, &u.Email, &u.DisplayName, &u.CreatedAt, &u.UpdatedAt)
-	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
-			return nil, nil
+	row := m.pool.QueryRow(ctx,
+		`SELECT `+userColumns+` FROM users WHERE id = $1`, id,
+	)
+	return scanUser(row)
 }
-		return nil, err
+
+func (m *UserModel) UpdateStripeCustomer(ctx context.Context, userID, stripeCustomerID string) error {
+	_, err := m.pool.Exec(ctx,
+		`UPDATE users SET stripe_customer_id = $2, updated_at = NOW() WHERE id = $1`,
+		userID, stripeCustomerID,
+	)
+	return err
 }
-	return &u, nil
+
+func (m *UserModel) ActivateSubscription(ctx context.Context, stripeCustomerID, subscriptionID, status string) error {
+	_, err := m.pool.Exec(ctx,
+		`UPDATE users
+		 SET stripe_subscription_id = $2,
+		     subscription_status = $3,
+		     subscription_created_at = COALESCE(subscription_created_at, NOW()),
+		     updated_at = NOW()
+		 WHERE stripe_customer_id = $1`,
+		stripeCustomerID, subscriptionID, status,
+	)
+	return err
+}
+
+func (m *UserModel) UpdateSubscriptionStatus(ctx context.Context, stripeCustomerID, status string) error {
+	_, err := m.pool.Exec(ctx,
+		`UPDATE users SET subscription_status = $2, updated_at = NOW()
+		 WHERE stripe_customer_id = $1`,
+		stripeCustomerID, status,
+	)
+	return err
 }

backend-go/internal/protocols/ethereum/jsonrpc.go

@@ -18,7 +18,7 @@ import (
 const (
 	rpcTimeoutMS    = 30000
 	rpcMaxRetries   = 3
-	rpcRetryBaseMS  = 1000
+	rpcRetryBaseMS  = 2000
 )
 
 type JsonRpcEthereum struct {

backend-go/internal/services/evaluator.go

@@ -4,8 +4,11 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"sync"
 	"time"
 
+	"golang.org/x/sync/semaphore"
+
 	"github.com/kjannette/koin-ping/backend-go/internal/domain"
 	"github.com/kjannette/koin-ping/backend-go/internal/models"
 	"github.com/kjannette/koin-ping/backend-go/internal/notifications"
@@ -17,6 +20,7 @@ const (
 	notificationTimeout    = 30 * time.Second
 	notificationMaxRetries = 3
 	notificationRetryBase  = time.Second
+	maxConcurrentNotifications = 5
 )
 
 type EvaluatorService struct {
@@ -27,6 +31,8 @@ type EvaluatorService struct {
 	notifConfigs *models.NotificationConfigModel
 	resendAPIKey string
 	emailFrom    string
+	notifSem     *semaphore.Weighted
+	notifWg      sync.WaitGroup
 }
 
 func NewEvaluatorService(
@@ -46,6 +52,7 @@ func NewEvaluatorService(
 		notifConfigs: notifConfigs,
 		resendAPIKey: resendAPIKey,
 		emailFrom:    emailFrom,
+		notifSem:     semaphore.NewWeighted(maxConcurrentNotifications),
 	}
 }
 
@@ -189,7 +196,14 @@ func (s *EvaluatorService) fireAlert(ctx context.Context, rule domain.AlertRule,
 	if addr != nil {
 		userID := addr.UserID
 		address := addr.Address
+		if err := s.notifSem.Acquire(ctx, 1); err != nil {
+			log.Printf("Failed to acquire notification semaphore for rule %d: %v", rule.ID, err)
+			return nil
+		}
+		s.notifWg.Add(1)
 		go func() {
+			defer s.notifSem.Release(1)
+			defer s.notifWg.Done()
 			notifCtx, cancel := context.WithTimeout(context.Background(), notificationTimeout)
 			defer cancel()
 			s.sendNotification(notifCtx, userID, message, obs, addressLabel, rule, address)
@@ -199,6 +213,11 @@ func (s *EvaluatorService) fireAlert(ctx context.Context, rule domain.AlertRule,
 	return nil
 }
 
+// WaitForNotifications blocks until all in-flight notification goroutines finish.
+func (s *EvaluatorService) WaitForNotifications() {
+	s.notifWg.Wait()
+}
+
 func (s *EvaluatorService) buildNotifiers(cfg *domain.NotificationConfig) []notifications.Notifier {
 	var notifiers []notifications.Notifier
 

frontend/src/App.jsx

@@ -1,12 +1,12 @@
 import { Routes, Route, Navigate } from "react-router-dom";
 import { useAuth } from "./contexts/AuthContext";
 import Navbar from "./components/Navbar";
-import Login from "./pages/Login";
+import Login from "./pages/login/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";
+import Subscribe from "./pages/subscribe/subscribe";
+import Addresses from "./pages/addresses/Addresses";
+import Alerts from "./pages/alerts/Alerts";
+import AlertHistory from "./pages/alertHistory/AlertHistory";
 
 export default function App() {
   const { currentUser } = useAuth();
@@ -16,7 +16,7 @@ export default function App() {
       <Routes>
         <Route path="/login" element={<Login />} />
         <Route path="/signup" element={<Signup />} />
-                <Route path="/onboarding" element={<Onboarding />} />
+        <Route path="/subscribe" element={<Subscribe />} />
         <Route path="*" element={<Navigate to="/login" />} />
       </Routes>
     );
@@ -30,7 +30,7 @@ export default function App() {
         <Route path="/addresses" element={<Addresses />} />
         <Route path="/alerts" element={<Alerts />} />
         <Route path="/alertevents" element={<AlertHistory />} />
-                <Route path="/onboarding" element={<Onboarding />} />
+        <Route path="/subscribe" element={<Subscribe />} />
         <Route path="*" element={<Navigate to="/addresses" />} />
       </Routes>
     </div>

frontend/src/api/stripe.jsx

@@ -0,0 +1,41 @@
+import { getAuthHeaders } from "./authHeaders";
+import { API_BASE } from "./config";
+
+export async function createCheckoutSession() {
+    const headers = await getAuthHeaders();
+    const res = await fetch(`${API_BASE}/stripe/create-checkout-session`, {
+        method: "POST",
+        headers,
+    });
+    if (!res.ok) {
+        const data = await res.json();
+        throw new Error(data.message || "Failed to create checkout session");
+    }
+    return res.json();
+}
+
+export async function verifyCheckoutSession(sessionId) {
+    const headers = await getAuthHeaders();
+    const res = await fetch(`${API_BASE}/stripe/verify-checkout`, {
+        method: "POST",
+        headers: { ...headers, "Content-Type": "application/json" },
+        body: JSON.stringify({ session_id: sessionId }),
+    });
+    if (!res.ok) {
+        const data = await res.json();
+        throw new Error(data.message || "Failed to verify checkout session");
+    }
+    return res.json();
+}
+
+export async function getSubscriptionStatus() {
+    const headers = await getAuthHeaders();
+    const res = await fetch(`${API_BASE}/stripe/subscription-status`, {
+        headers,
+    });
+    if (!res.ok) {
+        const data = await res.json();
+        throw new Error(data.message || "Failed to get subscription status");
+    }
+    return res.json();
+}

frontend/src/components/Input.css

@@ -1,6 +1,6 @@
 .input__label {
   display: block;
-  margin-bottom: 0.4rem;
+  margin: 0.8rem 0rem 0.4rem 0rem;
   font-size: 0.9rem;
 }
 

frontend/src/components/Navbar.jsx

@@ -5,7 +5,7 @@ import "./Navbar.css";
 const navLinks = [
   { to: "/addresses", label: "Addresses" },
   { to: "/alerts", label: "Configure Alerts" },
-  { to: "/alertevents", label: "Alert Events" },
+  { to: "/alertevents", label: "Alert Event History" },
 ];
 
 export default function Navbar() {

frontend/src/pages/Addresses.jsx

@@ -1,159 +0,0 @@
-import { useState, useEffect } from "react";
-import AddressForm from "../components/AddressForm";
-import { getAddresses, createAddress, deleteAddress, updateAddress } from "../api/addresses";
-import "./Addresses.css";
-
-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("");
-
-    useEffect(() => {
-        async function fetchAddresses() {
-            try {
-                setLoading(true);
-                const data = await getAddresses();
-                setAddresses(data);
-            } catch (err) {
-                setError(err.message);
-                console.error("Failed to fetch addresses:", err);
-            } finally {
-                setLoading(false);
-            }
-        }
-
-        fetchAddresses();
-    }, []);
-
-    async function handleAddressSubmit(data) {
-        try {
-            const newAddress = await createAddress(data);
-            setAddresses((prev) => [...prev, newAddress]);
-            setError(null);
-        } catch (err) {
-            setError(err.message);
-            console.error("Failed to create address:", err);
-        }
-    }
-
-    async function handleDelete(id, label) {
-        const displayName = label || "this address";
-        if (!window.confirm(`Remove "${displayName}"? This will also delete all associated alert rules.`)) {
-            return;
-        }
-        try {
-            await deleteAddress(id);
-            setAddresses((prev) => prev.filter((a) => a.id !== id));
-            setError(null);
-        } catch (err) {
-            setError(err.message);
-            console.error("Failed to delete address:", err);
-        }
-    }
-
-    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 className="page">
-            <h1>Add Addresses to Track</h1>
-
-            <div className="mb-xl">
-                <AddressForm onSubmit={handleAddressSubmit} />
-            </div>
-
-            <div>
-                <h2>Existing Tracked Addresses</h2>
-                {loading && <p>Loading addresses...</p>}
-                {error && <p className="text-error">Error: {error}</p>}
-                {!loading && !error && addresses.length === 0 && (
-                    <p className="text-dimmed">
-                        No addresses tracked yet. Add one above to get started.
-                    </p>
-                )}
-                {addresses.length > 0 && (
-                    <ul className="list-unstyled">
-                        {addresses.map((addr, index) => (
-                            <li key={addr.id || index} className="list-item--card">
-                                <div className="flex flex--between flex--center">
-                                    <div>
-                                        {editingId === addr.id ? (
-                                            <div className="flex flex--center gap-sm mb-sm">
-                                                <input
-                                                    value={editLabel}
-                                                    onChange={(e) => setEditLabel(e.target.value)}
-                                                    placeholder="Label (optional)"
-                                                    className="address__edit-input"
-                                                    onKeyDown={(e) => {
-                                                        if (e.key === "Enter") handleEditSave(addr.id);
-                                                        if (e.key === "Escape") handleEditCancel();
-                                                    }}
-                                                    autoFocus
-                                                />
-                                                <button
-                                                    onClick={() => handleEditSave(addr.id)}
-                                                    className="btn btn--primary btn--sm"
-                                                >
-                                                    Save
-                                                </button>
-                                                <button
-                                                    onClick={handleEditCancel}
-                                                    className="btn btn--ghost btn--sm"
-                                                >
-                                                    Cancel
-                                                </button>
-                                            </div>
-                                        ) : (
-                                            <div className="flex flex--center gap-sm mb-sm">
-                                                <span className="text-bold">
-                                                    {addr.label || "Unlabeled"}
-                                                </span>
-                                                <button
-                                                    onClick={() => handleEditStart(addr)}
-                                                    className="address__edit-link"
-                                                >
-                                                    Edit
-                                                </button>
-                                            </div>
-                                        )}
-                                        <div className="text-mono text-sm text-muted">
-                                            {addr.address}
-                                        </div>
-                                    </div>
-                                    <button
-                                        onClick={() => handleDelete(addr.id, addr.label)}
-                                        className="address__remove"
-                                    >
-                                        Remove
-                                    </button>
-                                </div>
-                            </li>
-                        ))}
-                    </ul>
-                )}
-            </div>
-        </div>
-    );
-}

frontend/src/pages/AlertHistory.jsx

@@ -1,67 +0,0 @@
-import { useState, useEffect } from "react";
-import { getAlertEvents } from "../api/alertEvents";
-import "./AlertHistory.css";
-
-export default function AlertHistory() {
-    const [alertEvents, setAlertEvents] = useState([]);
-    const [loading, setLoading] = useState(true);
-    const [error, setError] = useState(null);
-
-    useEffect(() => {
-        async function fetchAlertEvents() {
-            try {
-                setLoading(true);
-                const data = await getAlertEvents();
-                setAlertEvents(data);
-            } catch (err) {
-                setError(err.message);
-                console.error("Failed to fetch alert events:", err);
-            } finally {
-                setLoading(false);
-            }
-        }
-
-        fetchAlertEvents();
-    }, []);
-
-    if (loading) {
-        return <div className="page">Loading...</div>;
-    }
-
-    if (error) {
-        return (
-            <div className="page text-error">Error: {error}</div>
-        );
-    }
-
-    return (
-        <div className="page">
-            <h1>Recent Alert Events</h1>
-
-            {alertEvents.length === 0 ? (
-                <p className="text-dimmed">No alerts yet</p>
-            ) : (
-                <ul className="list-unstyled">
-                    {alertEvents.map((event) => (
-                        <li key={event.id} className="alert-history__item">
-                            <div className="mb-sm">{event.message}</div>
-                            {event.address_label && (
-                                <div className="text-sm text-dimmed">
-                                    Address: {event.address_label}
-                                </div>
-                            )}
-                            <small className="text-muted">
-                                {formatTimestamp(event.timestamp)}
-                            </small>
-                        </li>
-                    ))}
-                </ul>
-            )}
-        </div>
-    );
-}
-
-function formatTimestamp(timestamp) {
-    const date = new Date(timestamp);
-    return date.toLocaleString();
-}

frontend/src/pages/Alerts.jsx

@@ -1,522 +0,0 @@
-import { useState, useEffect } from "react";
-import AlertForm from "../components/AlertForm";
-import Button from "../components/Button";
-import Input from "../components/Input";
-import { getAddresses } from "../api/addresses";
-import {
-    getAlerts,
-    createAlert,
-    updateAlertStatus,
-    deleteAlert,
-} from "../api/alerts";
-import {
-    getNotificationConfig,
-    updateNotificationConfig,
-    testNotificationChannels,
-    setupEmail,
-    sendEmailDigest,
-} from "../api/notificationConfig";
-import "./Alerts.css";
-
-export default function Alerts() {
-    const [addresses, setAddresses] = useState([]);
-    const [selectedAddressId, setSelectedAddressId] = useState(null);
-    const [alerts, setAlerts] = useState([]);
-    const [loading, setLoading] = useState(true);
-    const [error, setError] = useState(null);
-
-    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 [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);
-
-    useEffect(() => {
-        async function fetchData() {
-            try {
-                setLoading(true);
-
-                const addressData = await getAddresses();
-                setAddresses(addressData);
-                if (addressData.length > 0) {
-                    setSelectedAddressId(addressData[0].id);
-                }
-
-                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);
-            } catch (err) {
-                setError(err.message);
-                console.error("Failed to fetch data:", err);
-            } finally {
-                setLoading(false);
-            }
-        }
-
-        fetchData();
-    }, []);
-
-    useEffect(() => {
-        if (!selectedAddressId) {
-            setAlerts([]);
-            return;
-        }
-
-        async function fetchAlerts() {
-            try {
-                const data = await getAlerts(selectedAddressId);
-                setAlerts(data);
-                setError(null);
-            } catch (err) {
-                setError(err.message);
-                console.error("Failed to fetch alerts:", err);
-            }
-        }
-
-        fetchAlerts();
-    }, [selectedAddressId]);
-
-    async function handleAlertSubmit(data) {
-        if (!selectedAddressId) return;
-
-        try {
-            const newAlert = await createAlert(selectedAddressId, data);
-            setAlerts((prev) => [...prev, newAlert]);
-            setError(null);
-        } catch (err) {
-            setError(err.message);
-            console.error("Failed to create alert:", err);
-        }
-    }
-
-    async function handleToggleAlert(alertId, currentStatus) {
-        try {
-            const updated = await updateAlertStatus(alertId, !currentStatus);
-            setAlerts((prev) =>
-                prev.map((alert) => (alert.id === alertId ? updated : alert)),
-            );
-            setError(null);
-        } catch (err) {
-            setError(err.message);
-            console.error("Failed to update alert:", err);
-        }
-    }
-
-    async function handleDeleteAlert(alertId) {
-        try {
-            await deleteAlert(alertId);
-            setAlerts((prev) => prev.filter((alert) => alert.id !== alertId));
-            setError(null);
-        } catch (err) {
-            setError(err.message);
-            console.error("Failed to delete alert:", err);
-        }
-    }
-
-    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,
-            };
-
-            await updateNotificationConfig(config);
-            setHasExistingConfig(true);
-            setNotificationSuccess("Notification settings saved!");
-            setTimeout(() => setNotificationSuccess(null), 3000);
-        } catch (err) {
-            setNotificationError(err.message);
-            console.error("Failed to save notification config:", err);
-        } finally {
-            setNotificationLoading(false);
-        }
-    }
-
-    async function handleTestChannels() {
-        try {
-            setTestingChannels(true);
-            setNotificationError(null);
-            setNotificationSuccess(null);
-
-            const data = await testNotificationChannels();
-            const results = data.results || [];
-
-            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!",
-            );
-            setTimeout(() => setNotificationSuccess(null), 5000);
-        } catch (err) {
-            setNotificationError(err.message);
-        } finally {
-            setSettingUpEmail(false);
-        }
-    }
-
-    async function handleSendDigest() {
-        try {
-            setSendingDigest(true);
-            setNotificationError(null);
-            setNotificationSuccess(null);
-
-            const result = await sendEmailDigest();
-            setNotificationSuccess(result.message || "Digest email sent!");
-            setTimeout(() => setNotificationSuccess(null), 5000);
-        } catch (err) {
-            setNotificationError(err.message);
-        } finally {
-            setSendingDigest(false);
-        }
-    }
-
-    const selectedAddress = addresses.find((a) => a.id === selectedAddressId);
-
-    if (loading) {
-        return <div className="page">Loading addresses...</div>;
-    }
-
-    if (addresses.length === 0) {
-        return (
-            <div className="page">
-                <p>No addresses tracked yet. Add an address first to create alerts.</p>
-            </div>
-        );
-    }
-
-    return (
-        <div className="page page--wide">
-            <h1 className="mb-xl">Alert Rules & Notifications</h1>
-
-            <div className="alerts-grid">
-                {/* LEFT COLUMN: Alert Rules */}
-                <div>
-                    <h2 className="mt-0">Alert Rules</h2>
-
-                    <div className="mb-xl">
-                        <label className="form-label mb-sm">
-                            <strong>Select Address:</strong>
-                        </label>
-                        <select
-                            value={selectedAddressId || ""}
-                            onChange={(e) =>
-                                setSelectedAddressId(Number(e.target.value))
-                            }
-                            className="form-select"
-                        >
-                            {addresses.map((addr) => (
-                                <option key={addr.id} value={addr.id}>
-                                    {addr.label || "Unlabeled"} - {addr.address}
-                                </option>
-                            ))}
-                        </select>
-                    </div>
-
-                    {selectedAddress && (
-                        <>
-                            <div className="alerts__address-info">
-                                <div className="text-sm text-muted">
-                                    Managing alerts for:
-                                </div>
-                                <div className="text-bold">
-                                    {selectedAddress.label || "Unlabeled"}
-                                </div>
-                                <div className="text-mono text-sm text-muted">
-                                    {selectedAddress.address}
-                                </div>
-                            </div>
-
-                            <div className="mb-xl">
-                                <h3>Create New Alert</h3>
-                                <AlertForm onSubmit={handleAlertSubmit} />
-                            </div>
-
-                            <div>
-                                <h3>Active Alert Rules</h3>
-                                {error && (
-                                    <p className="text-error">Error: {error}</p>
-                                )}
-                                {alerts.length === 0 ? (
-                                    <p className="text-dimmed">
-                                        No alert rules defined yet. Create one above.
-                                    </p>
-                                ) : (
-                                    <ul className="list-unstyled">
-                                        {alerts.map((alert) => (
-                                            <li
-                                                key={alert.id}
-                                                className={`alerts__rule ${!alert.enabled ? "alerts__rule--disabled" : ""}`}
-                                            >
-                                                <div className="flex flex--between">
-                                                    <div>
-                                                        <div className="text-bold mb-sm">
-                                                            {formatAlertType(alert.type)}
-                                                        </div>
-                                                        {alert.threshold && (
-                                                            <div className="text-sm text-muted">
-                                                                Threshold: {alert.threshold} ETH
-                                                            </div>
-                                                        )}
-                                                        <div className="text-xs text-dimmed">
-                                                            Status: {alert.enabled ? "Enabled" : "Disabled"}
-                                                        </div>
-                                                    </div>
-                                                    <div className="flex flex--center gap-sm">
-                                                        <Button
-                                                            onClick={() =>
-                                                                handleToggleAlert(alert.id, alert.enabled)
-                                                            }
-                                                        >
-                                                            {alert.enabled ? "Disable" : "Enable"}
-                                                        </Button>
-                                                        <Button
-                                                            onClick={() => handleDeleteAlert(alert.id)}
-                                                        >
-                                                            Delete
-                                                        </Button>
-                                                    </div>
-                                                </div>
-                                            </li>
-                                        ))}
-                                    </ul>
-                                )}
-                            </div>
-                        </>
-                    )}
-                </div>
-
-                {/* RIGHT COLUMN: Notification Settings */}
-                <div>
-                    <h2 className="mt-0">Notification Settings</h2>
-
-                    {notificationSuccess && (
-                        <div className="alert alert--success">{notificationSuccess}</div>
-                    )}
-
-                    {notificationError && (
-                        <div className="alert alert--error">{notificationError}</div>
-                    )}
-
-                    {/* Master toggle */}
-                    <div className="alerts__toggle-panel">
-                        <label className="alerts__toggle-label">
-                            <input
-                                type="checkbox"
-                                checked={notificationEnabled}
-                                onChange={(e) =>
-                                    setNotificationEnabled(e.target.checked)
-                                }
-                                className="alerts__toggle-checkbox"
-                            />
-                            <span className="text-bold">Enable Notifications</span>
-                        </label>
-                        <div className="alerts__toggle-hint">
-                            Master switch for all notification channels
-                        </div>
-                    </div>
-
-                    {/* All channel settings -- hidden when master toggle is off */}
-                    {notificationEnabled && (
-                        <>
-                            {/* Telegram */}
-                            <div className="section">
-                                <h3 className="mt-0 mb-md">Telegram</h3>
-                                <Input
-                                    label="Bot Token"
-                                    value={telegramBotToken}
-                                    onChange={setTelegramBotToken}
-                                    placeholder="123456789:ABCdefGHIjklMNOpqrSTUvwxYZ"
-                                />
-                                <Input
-                                    label="Chat ID"
-                                    value={telegramChatId}
-                                    onChange={setTelegramChatId}
-                                    placeholder="-1001234567890"
-                                />
-                                <a
-                                    href="https://core.telegram.org/bots#how-do-i-create-a-bot"
-                                    target="_blank"
-                                    rel="noopener noreferrer"
-                                    className="help-link"
-                                >
-                                    How to create a Telegram bot & get your Chat ID
-                                </a>
-                            </div>
-
-                            {/* Email */}
-                            <div className="section">
-                                <h3 className="mt-0 mb-md">Email</h3>
-                                <Input
-                                    label="Email Address"
-                                    type="email"
-                                    value={email}
-                                    onChange={setEmail}
-                                    placeholder="you@example.com"
-                                />
-                                <div className="help-link text-dimmed mb-md">
-                                    Alert notifications and digests will be sent to this address
-                                </div>
-                                <div className="alerts__email-buttons">
-                                    <Button
-                                        onClick={handleSetupEmail}
-                                        disabled={settingUpEmail || !email}
-                                        className="btn--sm"
-                                    >
-                                        {settingUpEmail ? "Setting up..." : "Verify Email"}
-                                    </Button>
-                                    <Button
-                                        onClick={handleSendDigest}
-                                        disabled={sendingDigest || !email}
-                                        variant="secondary"
-                                        className="btn--sm"
-                                    >
-                                        {sendingDigest ? "Sending..." : "Send Digest Now"}
-                                    </Button>
-                                </div>
-                            </div>
-
-                            {/* Discord */}
-                            <div className="section">
-                                <h3 className="mt-0 mb-md">Discord</h3>
-                                <Input
-                                    label="Discord Webhook URL"
-                                    value={discordWebhookUrl}
-                                    onChange={setDiscordWebhookUrl}
-                                    placeholder="https://discord.com/api/webhooks/..."
-                                />
-                                <a
-                                    href="https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks"
-                                    target="_blank"
-                                    rel="noopener noreferrer"
-                                    className="help-link"
-                                >
-                                    How to get a Discord webhook URL
-                                </a>
-                            </div>
-
-                            {/* Slack */}
-                            <div className="section">
-                                <h3 className="mt-0 mb-md">Slack</h3>
-                                <Input
-                                    label="Slack Webhook URL"
-                                    value={slackWebhookUrl}
-                                    onChange={setSlackWebhookUrl}
-                                    placeholder="https://hooks.slack.com/services/..."
-                                />
-                                <a
-                                    href="https://api.slack.com/messaging/webhooks"
-                                    target="_blank"
-                                    rel="noopener noreferrer"
-                                    className="help-link"
-                                >
-                                    How to set up Slack Incoming Webhooks
-                                </a>
-                            </div>
-
-                            {/* Save & Test buttons */}
-                            <div className="alerts__save-test">
-                                <Button
-                                    onClick={handleSaveNotificationConfig}
-                                    disabled={notificationLoading}
-                                    className="btn--lg"
-                                >
-                                    {notificationLoading ? "Saving..." : "Save Settings"}
-                                </Button>
-                                <Button
-                                    onClick={handleTestChannels}
-                                    disabled={testingChannels}
-                                    variant="success"
-                                    className="btn--lg"
-                                >
-                                    {testingChannels ? "Testing..." : "Test All Channels"}
-                                </Button>
-                            </div>
-                        </>
-                    )}
-                </div>
-            </div>
-        </div>
-    );
-}
-
-function formatAlertType(type) {
-    const labels = {
-        incoming_tx: "Incoming transaction",
-        outgoing_tx: "Outgoing transaction",
-        large_transfer: "Large transfer",
-        balance_below: "Balance below threshold",
-    };
-    return labels[type] || type;
-}

frontend/src/pages/Onboarding.jsx

@@ -1,644 +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";
-import Input from "../components/Input";
-import Button from "../components/Button";
-import "./Onboarding.css";
-
-const STEPS = [
-    "Create Account",
-    "Add Wallet",
-    "Alert Rules",
-    "Notifications",
-    "Done",
-];
-
-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);
-
-    const [data, setData] = useState({
-        email: "",
-        password: "",
-        confirmPassword: "",
-        walletAddress: "",
-        walletLabel: "",
-        createdAddressId: null,
-        alertIncomingTx: false,
-        alertOutgoingTx: false,
-        alertLargeTransfer: false,
-        largeTransferThreshold: "",
-        alertBalanceBelow: false,
-        balanceBelowThreshold: "",
-        discordWebhookUrl: "",
-        slackWebhookUrl: "",
-        notificationEmail: "",
-        alertsCreated: [],
-        notificationConfigured: false,
-    });
-
-    function set(field, value) {
-        setData((prev) => ({ ...prev, [field]: value }));
-    }
-
-    useEffect(() => {
-        if (!currentUser) return;
-        getAddresses()
-            .then((addresses) => {
-                if (addresses.length > 0) {
-                    navigate("/addresses", { replace: true });
-                }
-            })
-            .catch(() => {});
-    }, [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 (!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 className="progress-bar">
-                {STEPS.map((label, i) => {
-                    const stepNum = i + 1;
-                    const done = step > stepNum;
-                    const active = step === stepNum;
-                    const dotClass = done
-                        ? "progress-bar__dot--done"
-                        : active
-                          ? "progress-bar__dot--active"
-                          : "progress-bar__dot--pending";
-
-                    return (
-                        <div key={label} className="progress-bar__step">
-                            {i > 0 && (
-                                <div
-                                    className={`progress-bar__connector ${
-                                        done || active
-                                            ? "progress-bar__connector--active"
-                                            : "progress-bar__connector--inactive"
-                                    }`}
-                                />
-                            )}
-                            <div>
-                                <div className={`progress-bar__dot ${dotClass}`}>
-                                    {done ? "\u2713" : stepNum}
-                                </div>
-                                <div
-                                    className={`progress-bar__label ${
-                                        active
-                                            ? "progress-bar__label--active"
-                                            : "progress-bar__label--inactive"
-                                    }`}
-                                >
-                                    {label}
-                                </div>
-                            </div>
-                        </div>
-                    );
-                })}
-            </div>
-        );
-    }
-
-    // ── Step content ──────────────────────────────────────────────────────────
-
-    function Step1() {
-        return (
-            <>
-                <h2 className="mb-lg">Create your account</h2>
-                <Input
-                    label="Email"
-                    type="email"
-                    value={data.email}
-                    onChange={(v) => set("email", v)}
-                    disabled={loading}
-                    placeholder="you@example.com"
-                />
-                <Input
-                    label="Password"
-                    type="password"
-                    value={data.password}
-                    onChange={(v) => set("password", v)}
-                    disabled={loading}
-                    placeholder="At least 6 characters"
-                />
-                <Input
-                    label="Confirm Password"
-                    type="password"
-                    value={data.confirmPassword}
-                    onChange={(v) => set("confirmPassword", v)}
-                    disabled={loading}
-                    placeholder="Repeat your password"
-                    className="form-field--last"
-                />
-            </>
-        );
-    }
-
-    function Step2() {
-        return (
-            <>
-                <h2 className="mb-sm">Add a wallet address</h2>
-                <p className="onboarding__subtitle">
-                    Enter the Ethereum address you want to monitor.
-                </p>
-                <Input
-                    label="ETH Address"
-                    value={data.walletAddress}
-                    onChange={(v) => set("walletAddress", v)}
-                    disabled={loading}
-                    placeholder="0x..."
-                />
-                <Input
-                    label="Label (optional)"
-                    value={data.walletLabel}
-                    onChange={(v) => set("walletLabel", v)}
-                    disabled={loading}
-                    placeholder="e.g. My main wallet"
-                    className="form-field--last"
-                />
-            </>
-        );
-    }
-
-    function Step3() {
-        return (
-            <>
-                <h2 className="mb-sm">Configure alert rules</h2>
-                <p className="onboarding__subtitle">
-                    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 className="checkbox-row__nested">
-                            <Input
-                                type="number"
-                                label=""
-                                value={data.largeTransferThreshold}
-                                onChange={(v) => set("largeTransferThreshold", v)}
-                                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 className="checkbox-row__nested">
-                            <Input
-                                type="number"
-                                label=""
-                                value={data.balanceBelowThreshold}
-                                onChange={(v) => set("balanceBelowThreshold", v)}
-                                placeholder="Threshold (ETH)"
-                                min="0"
-                                step="0.01"
-                            />
-                        </div>
-                    )}
-                </CheckboxRow>
-            </>
-        );
-    }
-
-    function Step4() {
-        return (
-            <>
-                <h2 className="mb-sm">Set up notifications</h2>
-                <p className="onboarding__subtitle">
-                    Add at least one channel so you receive alerts. All fields are optional.
-                </p>
-
-                <div className="mb-md">
-                    <label className="form-label">
-                        Discord Webhook URL{" "}
-                        <a
-                            href="https://support.discord.com/hc/en-us/articles/228383668"
-                            target="_blank"
-                            rel="noreferrer"
-                            className="help-link"
-                        >
-                            (how to get one)
-                        </a>
-                    </label>
-                    <Input
-                        label=""
-                        type="url"
-                        value={data.discordWebhookUrl}
-                        onChange={(v) => set("discordWebhookUrl", v)}
-                        disabled={loading}
-                        placeholder="https://discord.com/api/webhooks/..."
-                    />
-                </div>
-
-                <div className="mb-md">
-                    <label className="form-label">
-                        Slack Webhook URL{" "}
-                        <a
-                            href="https://api.slack.com/messaging/webhooks"
-                            target="_blank"
-                            rel="noreferrer"
-                            className="help-link"
-                        >
-                            (how to get one)
-                        </a>
-                    </label>
-                    <Input
-                        label=""
-                        type="url"
-                        value={data.slackWebhookUrl}
-                        onChange={(v) => set("slackWebhookUrl", v)}
-                        disabled={loading}
-                        placeholder="https://hooks.slack.com/services/..."
-                    />
-                </div>
-
-                <Input
-                    label="Email address for alerts"
-                    type="email"
-                    value={data.notificationEmail}
-                    onChange={(v) => set("notificationEmail", v)}
-                    disabled={loading}
-                    placeholder="you@example.com"
-                    className="form-field--last"
-                />
-            </>
-        );
-    }
-
-    function Step5() {
-        const alertCount = data.alertsCreated.length;
-        const hasNotif = data.notificationConfigured;
-
-        return (
-            <>
-                <h2 className="mb-md">You're all set!</h2>
-
-                <div className="onboarding__summary">
-                    <p className="onboarding__summary-title">Summary</p>
-                    <ul className="onboarding__summary-list">
-                        <li>
-                            Wallet address added:{" "}
-                            <span className="text-mono text-white-sm">
-                                {data.walletAddress}
-                            </span>
-                            {data.walletLabel && ` (${data.walletLabel})`}
-                        </li>
-                        <li>
-                            Alert rules configured:{" "}
-                            <span className="text-white">
-                                {alertCount > 0 ? `${alertCount} rule${alertCount !== 1 ? "s" : ""}` : "None (skipped)"}
-                            </span>
-                        </li>
-                        <li>
-                            Notification channels:{" "}
-                            <span className="text-white">
-                                {hasNotif ? "Configured" : "Not set up (skipped)"}
-                            </span>
-                        </li>
-                    </ul>
-                </div>
-
-                {hasNotif && (
-                    <div className="mb-lg">
-                        <Button
-                            onClick={handleTestChannels}
-                            disabled={testLoading}
-                            variant="ghost"
-                        >
-                            {testLoading ? "Testing..." : "Test All Channels"}
-                        </Button>
-
-                        {testResults && (
-                            <div className="mt-md">
-                                {testResults.error ? (
-                                    <p className="text-error">{testResults.error}</p>
-                                ) : (
-                                    <ul className="list-unstyled">
-                                        {Object.entries(testResults).map(([channel, result]) => (
-                                            <li
-                                                key={channel}
-                                                className={`test-result ${result.success ? "test-result--success" : "test-result--failure"}`}
-                                            >
-                                                {result.success ? "\u2713" : "\u2717"} {channel}:{" "}
-                                                {result.message || (result.success ? "OK" : "Failed")}
-                                            </li>
-                                        ))}
-                                    </ul>
-                                )}
-                            </div>
-                        )}
-                    </div>
-                )}
-
-                <Button onClick={() => navigate("/addresses")} className="btn--lg text-bold">
-                    Go to Dashboard →
-                </Button>
-            </>
-        );
-    }
-
-    // ── Shared helpers ────────────────────────────────────────────────────────
-
-    function CheckboxRow({ checked, onChange, label, children }) {
-        return (
-            <div className="checkbox-row">
-                <label className="checkbox-row__label">
-                    <input
-                        type="checkbox"
-                        checked={checked}
-                        onChange={(e) => onChange(e.target.checked)}
-                        className="checkbox-row__input"
-                    />
-                    {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 className="onboarding__footer">
-                <div>
-                    {canBack && (
-                        <Button
-                            onClick={handleBack}
-                            disabled={loading}
-                            variant="ghost"
-                        >
-                            ← Back
-                        </Button>
-                    )}
-                </div>
-
-                <div className="flex gap-md">
-                    {canSkip && (
-                        <Button
-                            onClick={handleSkip}
-                            disabled={loading}
-                            variant="ghost"
-                        >
-                            Skip for now
-                        </Button>
-                    )}
-                    <Button
-                        onClick={handleNext}
-                        disabled={loading}
-                        className="text-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 className="onboarding">
-            <div className="onboarding__container">
-                <h1 className="onboarding__title">Koin Ping</h1>
-
-                <ProgressBar />
-
-                {error && (
-                    <div className="alert alert--error">{error}</div>
-                )}
-
-                {skipWarning && (
-                    <div className="alert alert--warning">{skipWarning}</div>
-                )}
-
-                <div className="onboarding__card">
-                    {stepContent[step]}
-                    <Footer />
-                </div>
-
-                {step === 1 && (
-                    <p className="onboarding__login-link">
-                        Already have an account?{" "}
-                        <a href="/login">Log in here</a>
-                    </p>
-                )}
-            </div>
-        </div>
-    );
-}

frontend/src/pages/Signup.jsx

@@ -1,5 +1,5 @@
 import { Navigate } from "react-router-dom";
 
 export default function Signup() {
-    return <Navigate to="/onboarding" replace />;
+    return <Navigate to="/subscribe" replace />;
 }

frontend/src/pages/addresses/Addresses.jsx

@@ -0,0 +1,159 @@
+import { useState, useEffect } from "react";
+import AddressForm from "../../components/AddressForm";
+import { getAddresses, createAddress, deleteAddress, updateAddress } from "../../api/addresses";
+import "./Addresses.css";
+
+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("");
+
+  useEffect(() => {
+    async function fetchAddresses() {
+      try {
+        setLoading(true);
+        const data = await getAddresses();
+        setAddresses(data);
+      } catch (err) {
+        setError(err.message);
+        console.error("Failed to fetch addresses:", err);
+      } finally {
+        setLoading(false);
+      }
+    }
+
+    fetchAddresses();
+  }, []);
+
+  async function handleAddressSubmit(data) {
+    try {
+      const newAddress = await createAddress(data);
+      setAddresses((prev) => [...prev, newAddress]);
+      setError(null);
+    } catch (err) {
+      setError(err.message);
+      console.error("Failed to create address:", err);
+    }
+  }
+
+  async function handleDelete(id, label) {
+    const displayName = label || "this address";
+    if (!window.confirm(`Remove "${displayName}"? This will also delete all associated alert rules.`)) {
+      return;
+    }
+    try {
+      await deleteAddress(id);
+      setAddresses((prev) => prev.filter((a) => a.id !== id));
+      setError(null);
+    } catch (err) {
+      setError(err.message);
+      console.error("Failed to delete address:", err);
+    }
+  }
+
+  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 className="page">
+      <h1>Add Addresses to Track</h1>
+
+      <div className="mb-xl">
+        <AddressForm onSubmit={handleAddressSubmit} />
+      </div>
+
+      <div>
+        <h2>Existing Tracked Addresses</h2>
+        {loading && <p>Loading addresses...</p>}
+        {error && <p className="text-error">Error: {error}</p>}
+        {!loading && !error && addresses.length === 0 && (
+          <p className="text-dimmed">
+            No addresses tracked yet. Add one above to get started.
+          </p>
+        )}
+        {addresses.length > 0 && (
+          <ul className="list-unstyled">
+            {addresses.map((addr, index) => (
+              <li key={addr.id || index} className="list-item--card">
+                <div className="flex flex--between flex--center">
+                  <div>
+                    {editingId === addr.id ? (
+                      <div className="flex flex--center gap-sm mb-sm">
+                        <input
+                          value={editLabel}
+                          onChange={(e) => setEditLabel(e.target.value)}
+                          placeholder="Label (optional)"
+                          className="address__edit-input"
+                          onKeyDown={(e) => {
+                            if (e.key === "Enter") handleEditSave(addr.id);
+                            if (e.key === "Escape") handleEditCancel();
+                          }}
+                          autoFocus
+                        />
+                        <button
+                          onClick={() => handleEditSave(addr.id)}
+                          className="btn btn--primary btn--sm"
+                        >
+                          Save
+                        </button>
+                        <button
+                          onClick={handleEditCancel}
+                          className="btn btn--ghost btn--sm"
+                        >
+                          Cancel
+                        </button>
+                      </div>
+                    ) : (
+                      <div className="flex flex--center gap-sm mb-sm">
+                        <span className="text-bold">
+                          {addr.label || "Unlabeled"}
+                        </span>
+                        <button
+                          onClick={() => handleEditStart(addr)}
+                          className="address__edit-link"
+                        >
+                          Edit
+                        </button>
+                      </div>
+                    )}
+                    <div className="text-mono text-sm text-muted">
+                      {addr.address}
+                    </div>
+                  </div>
+                  <button
+                    onClick={() => handleDelete(addr.id, addr.label)}
+                    className="address__remove"
+                  >
+                    Remove
+                  </button>
+                </div>
+              </li>
+            ))}
+          </ul>
+        )}
+      </div>
+    </div>
+  );
+}

frontend/src/pages/alertHistory/AlertHistory.jsx

@@ -0,0 +1,67 @@
+import { useState, useEffect } from "react";
+import { getAlertEvents } from "../../api/alertEvents";
+import "./AlertHistory.css";
+
+export default function AlertHistory() {
+  const [alertEvents, setAlertEvents] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+
+  useEffect(() => {
+    async function fetchAlertEvents() {
+      try {
+        setLoading(true);
+        const data = await getAlertEvents();
+        setAlertEvents(data);
+      } catch (err) {
+        setError(err.message);
+        console.error("Failed to fetch alert events:", err);
+      } finally {
+        setLoading(false);
+      }
+    }
+
+    fetchAlertEvents();
+  }, []);
+
+  if (loading) {
+    return <div className="page">Loading...</div>;
+  }
+
+  if (error) {
+    return (
+      <div className="page text-error">Error: {error}</div>
+    );
+  }
+
+  return (
+    <div className="page">
+      <h1>Recent Alert Events</h1>
+
+      {alertEvents.length === 0 ? (
+        <p className="text-dimmed">No alerts yet</p>
+      ) : (
+        <ul className="list-unstyled">
+          {alertEvents.map((event) => (
+            <li key={event.id} className="alert-history__item">
+              <div className="mb-sm">{event.message}</div>
+              {event.address_label && (
+                <div className="text-sm text-dimmed">
+                  Address: {event.address_label}
+                </div>
+              )}
+              <small className="text-muted">
+                {formatTimestamp(event.timestamp)}
+              </small>
+            </li>
+          ))}
+        </ul>
+      )}
+    </div>
+  );
+}
+
+function formatTimestamp(timestamp) {
+  const date = new Date(timestamp);
+  return date.toLocaleString();
+}

frontend/src/pages/alerts/Alerts.jsx

@@ -0,0 +1,522 @@
+import { useState, useEffect } from "react";
+import AlertForm from "../../components/AlertForm";
+import Button from "../../components/Button";
+import Input from "../../components/Input";
+import { getAddresses } from "../../api/addresses";
+import {
+  getAlerts,
+  createAlert,
+  updateAlertStatus,
+  deleteAlert,
+} from "../../api/alerts";
+import {
+  getNotificationConfig,
+  updateNotificationConfig,
+  testNotificationChannels,
+  setupEmail,
+  sendEmailDigest,
+} from "../../api/notificationConfig";
+import "./Alerts.css";
+
+export default function Alerts() {
+  const [addresses, setAddresses] = useState([]);
+  const [selectedAddressId, setSelectedAddressId] = useState(null);
+  const [alerts, setAlerts] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+
+  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 [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);
+
+  useEffect(() => {
+    async function fetchData() {
+      try {
+        setLoading(true);
+
+        const addressData = await getAddresses();
+        setAddresses(addressData);
+        if (addressData.length > 0) {
+          setSelectedAddressId(addressData[0].id);
+        }
+
+        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);
+      } catch (err) {
+        setError(err.message);
+        console.error("Failed to fetch data:", err);
+      } finally {
+        setLoading(false);
+      }
+    }
+
+    fetchData();
+  }, []);
+
+  useEffect(() => {
+    if (!selectedAddressId) {
+      setAlerts([]);
+      return;
+    }
+
+    async function fetchAlerts() {
+      try {
+        const data = await getAlerts(selectedAddressId);
+        setAlerts(data);
+        setError(null);
+      } catch (err) {
+        setError(err.message);
+        console.error("Failed to fetch alerts:", err);
+      }
+    }
+
+    fetchAlerts();
+  }, [selectedAddressId]);
+
+  async function handleAlertSubmit(data) {
+    if (!selectedAddressId) return;
+
+    try {
+      const newAlert = await createAlert(selectedAddressId, data);
+      setAlerts((prev) => [...prev, newAlert]);
+      setError(null);
+    } catch (err) {
+      setError(err.message);
+      console.error("Failed to create alert:", err);
+    }
+  }
+
+  async function handleToggleAlert(alertId, currentStatus) {
+    try {
+      const updated = await updateAlertStatus(alertId, !currentStatus);
+      setAlerts((prev) =>
+        prev.map((alert) => (alert.id === alertId ? updated : alert)),
+      );
+      setError(null);
+    } catch (err) {
+      setError(err.message);
+      console.error("Failed to update alert:", err);
+    }
+  }
+
+  async function handleDeleteAlert(alertId) {
+    try {
+      await deleteAlert(alertId);
+      setAlerts((prev) => prev.filter((alert) => alert.id !== alertId));
+      setError(null);
+    } catch (err) {
+      setError(err.message);
+      console.error("Failed to delete alert:", err);
+    }
+  }
+
+  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,
+      };
+
+      await updateNotificationConfig(config);
+      setHasExistingConfig(true);
+      setNotificationSuccess("Notification settings saved!");
+      setTimeout(() => setNotificationSuccess(null), 3000);
+    } catch (err) {
+      setNotificationError(err.message);
+      console.error("Failed to save notification config:", err);
+    } finally {
+      setNotificationLoading(false);
+    }
+  }
+
+  async function handleTestChannels() {
+    try {
+      setTestingChannels(true);
+      setNotificationError(null);
+      setNotificationSuccess(null);
+
+      const data = await testNotificationChannels();
+      const results = data.results || [];
+
+      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!",
+      );
+      setTimeout(() => setNotificationSuccess(null), 5000);
+    } catch (err) {
+      setNotificationError(err.message);
+    } finally {
+      setSettingUpEmail(false);
+    }
+  }
+
+  async function handleSendDigest() {
+    try {
+      setSendingDigest(true);
+      setNotificationError(null);
+      setNotificationSuccess(null);
+
+      const result = await sendEmailDigest();
+      setNotificationSuccess(result.message || "Digest email sent!");
+      setTimeout(() => setNotificationSuccess(null), 5000);
+    } catch (err) {
+      setNotificationError(err.message);
+    } finally {
+      setSendingDigest(false);
+    }
+  }
+
+  const selectedAddress = addresses.find((a) => a.id === selectedAddressId);
+
+  if (loading) {
+    return <div className="page">Loading addresses...</div>;
+  }
+
+  if (addresses.length === 0) {
+    return (
+      <div className="page">
+        <p>No addresses tracked yet. Add an address first to create alerts.</p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="page page--wide">
+      <h1 className="mb-xl">Alert Rules & Notifications</h1>
+
+      <div className="alerts-grid">
+        {/* LEFT COLUMN: Alert Rules */}
+        <div>
+          <h2 className="mt-0">Alert Rules</h2>
+
+          <div className="mb-xl">
+            <label className="form-label mb-sm">
+              <strong>Select Address:</strong>
+            </label>
+            <select
+              value={selectedAddressId || ""}
+              onChange={(e) =>
+                setSelectedAddressId(Number(e.target.value))
+              }
+              className="form-select"
+            >
+              {addresses.map((addr) => (
+                <option key={addr.id} value={addr.id}>
+                  {addr.label || "Unlabeled"} - {addr.address}
+                </option>
+              ))}
+            </select>
+          </div>
+
+          {selectedAddress && (
+            <>
+              <div className="alerts__address-info">
+                <div className="text-sm text-muted">
+                  Managing alerts for:
+                </div>
+                <div className="text-bold">
+                  {selectedAddress.label || "Unlabeled"}
+                </div>
+                <div className="text-mono text-sm text-muted">
+                  {selectedAddress.address}
+                </div>
+              </div>
+
+              <div className="mb-xl">
+                <h3>Create New Alert</h3>
+                <AlertForm onSubmit={handleAlertSubmit} />
+              </div>
+
+              <div>
+                <h3>Active Alert Rules</h3>
+                {error && (
+                  <p className="text-error">Error: {error}</p>
+                )}
+                {alerts.length === 0 ? (
+                  <p className="text-dimmed">
+                    No alert rules defined yet. Create one above.
+                  </p>
+                ) : (
+                  <ul className="list-unstyled">
+                    {alerts.map((alert) => (
+                      <li
+                        key={alert.id}
+                        className={`alerts__rule ${!alert.enabled ? "alerts__rule--disabled" : ""}`}
+                      >
+                        <div className="flex flex--between">
+                          <div>
+                            <div className="text-bold mb-sm">
+                              {formatAlertType(alert.type)}
+                            </div>
+                            {alert.threshold && (
+                              <div className="text-sm text-muted">
+                                Threshold: {alert.threshold} ETH
+                              </div>
+                            )}
+                            <div className="text-xs text-dimmed">
+                              Status: {alert.enabled ? "Enabled" : "Disabled"}
+                            </div>
+                          </div>
+                          <div className="flex flex--center gap-sm">
+                            <Button
+                              onClick={() =>
+                                handleToggleAlert(alert.id, alert.enabled)
+                              }
+                            >
+                              {alert.enabled ? "Disable" : "Enable"}
+                            </Button>
+                            <Button
+                              onClick={() => handleDeleteAlert(alert.id)}
+                            >
+                              Delete
+                            </Button>
+                          </div>
+                        </div>
+                      </li>
+                    ))}
+                  </ul>
+                )}
+              </div>
+            </>
+          )}
+        </div>
+
+        {/* RIGHT COLUMN: Notification Settings */}
+        <div>
+          <h2 className="mt-0">Notification Settings</h2>
+
+          {notificationSuccess && (
+            <div className="alert alert--success">{notificationSuccess}</div>
+          )}
+
+          {notificationError && (
+            <div className="alert alert--error">{notificationError}</div>
+          )}
+
+          {/* Master toggle */}
+          <div className="alerts__toggle-panel">
+            <label className="alerts__toggle-label">
+              <input
+                type="checkbox"
+                checked={notificationEnabled}
+                onChange={(e) =>
+                  setNotificationEnabled(e.target.checked)
+                }
+                className="alerts__toggle-checkbox"
+              />
+              <span className="text-bold">Enable Notifications</span>
+            </label>
+            <div className="alerts__toggle-hint">
+              Master switch for all notification channels
+            </div>
+          </div>
+
+          {/* All channel settings -- hidden when master toggle is off */}
+          {notificationEnabled && (
+            <>
+              {/* Telegram */}
+              <div className="section">
+                <h3 className="mt-0 mb-md">Telegram</h3>
+                <Input
+                  label="Bot Token"
+                  value={telegramBotToken}
+                  onChange={setTelegramBotToken}
+                  placeholder="123456789:ABCdefGHIjklMNOpqrSTUvwxYZ"
+                />
+                <Input
+                  label="Chat ID"
+                  value={telegramChatId}
+                  onChange={setTelegramChatId}
+                  placeholder="-1001234567890"
+                />
+                <a
+                  href="https://core.telegram.org/bots#how-do-i-create-a-bot"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="help-link"
+                >
+                  How to create a Telegram bot & get your Chat ID
+                </a>
+              </div>
+
+              {/* Email */}
+              <div className="section">
+                <h3 className="mt-0 mb-md">Email</h3>
+                <Input
+                  label="Email Address"
+                  type="email"
+                  value={email}
+                  onChange={setEmail}
+                  placeholder="you@example.com"
+                />
+                <div className="help-link text-dimmed mb-md">
+                  Alert notifications and digests will be sent to this address
+                </div>
+                <div className="alerts__email-buttons">
+                  <Button
+                    onClick={handleSetupEmail}
+                    disabled={settingUpEmail || !email}
+                    className="btn--sm"
+                  >
+                    {settingUpEmail ? "Setting up..." : "Verify Email"}
+                  </Button>
+                  <Button
+                    onClick={handleSendDigest}
+                    disabled={sendingDigest || !email}
+                    variant="secondary"
+                    className="btn--sm"
+                  >
+                    {sendingDigest ? "Sending..." : "Send Digest Now"}
+                  </Button>
+                </div>
+              </div>
+
+              {/* Discord */}
+              <div className="section">
+                <h3 className="mt-0 mb-md">Discord</h3>
+                <Input
+                  label="Discord Webhook URL"
+                  value={discordWebhookUrl}
+                  onChange={setDiscordWebhookUrl}
+                  placeholder="https://discord.com/api/webhooks/..."
+                />
+                <a
+                  href="https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="help-link"
+                >
+                  How to get a Discord webhook URL
+                </a>
+              </div>
+
+              {/* Slack */}
+              <div className="section">
+                <h3 className="mt-0 mb-md">Slack</h3>
+                <Input
+                  label="Slack Webhook URL"
+                  value={slackWebhookUrl}
+                  onChange={setSlackWebhookUrl}
+                  placeholder="https://hooks.slack.com/services/..."
+                />
+                <a
+                  href="https://api.slack.com/messaging/webhooks"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="help-link"
+                >
+                  How to set up Slack Incoming Webhooks
+                </a>
+              </div>
+
+              {/* Save & Test buttons */}
+              <div className="alerts__save-test">
+                <Button
+                  onClick={handleSaveNotificationConfig}
+                  disabled={notificationLoading}
+                  className="btn--lg"
+                >
+                  {notificationLoading ? "Saving..." : "Save Settings"}
+                </Button>
+                <Button
+                  onClick={handleTestChannels}
+                  disabled={testingChannels}
+                  variant="success"
+                  className="btn--lg"
+                >
+                  {testingChannels ? "Testing..." : "Test All Channels"}
+                </Button>
+              </div>
+            </>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function formatAlertType(type) {
+  const labels = {
+    incoming_tx: "Incoming transaction",
+    outgoing_tx: "Outgoing transaction",
+    large_transfer: "Large transfer",
+    balance_below: "Balance below threshold",
+  };
+  return labels[type] || type;
+}

frontend/src/pages/login/Login.jsx

@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { Link, useNavigate } from "react-router-dom";
-import { useAuth } from "../contexts/AuthContext";
-import Input from "../components/Input";
+import { useAuth } from "../../contexts/AuthContext";
+import Input from "../../components/Input";
 import "./Login.css";
 
 export default function Login() {

frontend/src/pages/subscribe/subscribe.css

@@ -1,4 +1,4 @@
-.onboarding {
+.subscribe {
   min-height: 100vh;
   background-color: var(--color-bg);
   display: flex;
@@ -9,34 +9,34 @@
   padding-bottom: 3rem;
 }
 
-.onboarding__container {
+.subscribe__container {
   width: 100%;
   max-width: 540px;
   padding: 0 1rem;
 }
 
-.onboarding__title {
+.subscribe__title {
   text-align: center;
   margin-bottom: 2rem;
   color: var(--color-primary);
   letter-spacing: 0.5px;
 }
 
-.onboarding__card {
+.subscribe__card {
   background-color: var(--color-bg-elevated);
   border: 1px solid var(--color-border-light);
   border-radius: var(--radius-xl);
   padding: 2rem;
 }
 
-.onboarding__login-link {
+.subscribe__login-link {
   text-align: center;
   margin-top: 1.25rem;
   color: #888;
   font-size: 0.9rem;
 }
 
-.onboarding__login-link a {
+.subscribe__login-link a {
   color: var(--color-primary);
 }
 
@@ -108,7 +108,7 @@
 }
 
 /* Step 5 summary */
-.onboarding__summary {
+.subscribe__summary {
   background-color: #1e2e1e;
   border: 1px solid #2d5a2d;
   border-radius: var(--radius-lg);
@@ -116,13 +116,13 @@
   margin-bottom: 1.5rem;
 }
 
-.onboarding__summary-title {
+.subscribe__summary-title {
   margin: 0 0 0.5rem;
   color: #90ee90;
   font-weight: bold;
 }
 
-.onboarding__summary-list {
+.subscribe__summary-list {
   margin: 0;
   padding-left: 1.25rem;
   color: var(--color-text-label);
@@ -154,7 +154,7 @@
 }
 
 /* Footer navigation */
-.onboarding__footer {
+.subscribe__footer {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -178,8 +178,61 @@
 }
 
 /* Step subtitle */
-.onboarding__subtitle {
+.subscribe__subtitle {
   color: #aaa;
   margin-bottom: 1.5rem;
   font-size: 0.9rem;
 }
+
+/* Subscribe card (Step 2) */
+.subscribe-card {
+  background-color: var(--color-bg-card, #1a1a2e);
+  border: 1px solid var(--color-border-light);
+  border-radius: var(--radius-lg);
+  padding: 1.5rem;
+  text-align: center;
+  margin-bottom: 1rem;
+}
+
+.subscribe-card__price {
+  margin-bottom: 1.25rem;
+}
+
+.subscribe-card__amount {
+  font-size: 2.5rem;
+  font-weight: 700;
+  color: white;
+}
+
+.subscribe-card__period {
+  font-size: 1rem;
+  color: #888;
+  margin-left: 2px;
+}
+
+.subscribe-card__features {
+  list-style: none;
+  padding: 0;
+  margin: 0 0 1.25rem;
+  text-align: left;
+}
+
+.subscribe-card__features li {
+  padding: 0.35rem 0;
+  color: #ccc;
+  font-size: 0.9rem;
+}
+
+.subscribe-card__features li::before {
+  content: "\2713";
+  color: var(--color-primary);
+  margin-right: 0.6rem;
+  font-weight: bold;
+}
+
+.subscribe-card__commitment {
+  color: #999;
+  font-size: 0.8rem;
+  margin: 0;
+  font-style: italic;
+}

frontend/src/pages/subscribe/subscribe.jsx

@@ -0,0 +1,679 @@
+/**
+ * Subscribe / Subscribe Wizard
+ *
+ * 5-step guided flow: Create Account -> Add Wallet -> Alert Rules -> Notifications -> Done
+ * After account creation, user is redirected to Stripe Checkout for payment.
+ * On successful payment, they return here at step 2 (Add Wallet).
+ */
+
+import { useState, useEffect } from "react";
+import { useNavigate, useSearchParams } 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";
+import { createCheckoutSession, getSubscriptionStatus, verifyCheckoutSession } from "../../api/stripe";
+import Input from "../../components/Input";
+import Button from "../../components/Button";
+import "./Subscribe.css";
+
+const STEPS = [
+  "Create Account",
+  "Add Wallet",
+  "Alert Rules",
+  "Notifications",
+  "Done",
+];
+
+export default function Subscribe() {
+  const { currentUser, signup } = useAuth();
+  const navigate = useNavigate();
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  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);
+
+  const [data, setData] = useState({
+    email: "",
+    password: "",
+    confirmPassword: "",
+    walletAddress: "",
+    walletLabel: "",
+    createdAddressId: null,
+    alertIncomingTx: false,
+    alertOutgoingTx: false,
+    alertLargeTransfer: false,
+    largeTransferThreshold: "",
+    alertBalanceBelow: false,
+    balanceBelowThreshold: "",
+    discordWebhookUrl: "",
+    slackWebhookUrl: "",
+    notificationEmail: "",
+    alertsCreated: [],
+    notificationConfigured: false,
+  });
+
+  function set(field, value) {
+    setData((prev) => ({ ...prev, [field]: value }));
+  }
+
+  useEffect(() => {
+    if (!currentUser) return;
+    getAddresses()
+      .then((addresses) => {
+        if (addresses.length > 0) {
+          navigate("/addresses", { replace: true });
+        }
+      })
+      .catch(() => { });
+  }, [currentUser, navigate]);
+
+  // Handle Stripe redirect back from checkout
+  useEffect(() => {
+    if (!currentUser) return;
+    const payment = searchParams.get("payment");
+    const sessionId = searchParams.get("session_id");
+    if (payment === "success" && sessionId) {
+      setSearchParams({}, { replace: true });
+      setLoading(true);
+      verifyCheckoutSession(sessionId)
+        .then(() => {
+          setStep(2);
+        })
+        .catch((err) => {
+          setError("Payment verification failed: " + err.message);
+          setStep(1);
+        })
+        .finally(() => setLoading(false));
+    } else if (payment === "cancelled") {
+      setSearchParams({}, { replace: true });
+      setStep(1);
+      setError("Payment was cancelled. Please try again.");
+    }
+  }, [currentUser, searchParams, setSearchParams]);
+
+  // ── 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;
+    }
+    try {
+      setLoading(true);
+      if (!currentUser) {
+        await signup(data.email, data.password);
+      }
+      const status = await getSubscriptionStatus();
+      if (status.subscription_status === "active" || status.subscription_status === "trialing") {
+        setStep(2);
+        return;
+      }
+      const { url } = await createCheckoutSession();
+      window.location.href = url;
+    } 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);
+    }
+  }
+
+  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 className="progress-bar">
+        {STEPS.map((label, i) => {
+          const stepNum = i + 1;
+          const done = step > stepNum;
+          const active = step === stepNum;
+          const dotClass = done
+            ? "progress-bar__dot--done"
+            : active
+              ? "progress-bar__dot--active"
+              : "progress-bar__dot--pending";
+
+          return (
+            <div key={label} className="progress-bar__step">
+              {i > 0 && (
+                <div
+                  className={`progress-bar__connector ${done || active
+                    ? "progress-bar__connector--active"
+                    : "progress-bar__connector--inactive"
+                    }`}
+                />
+              )}
+              <div>
+                <div className={`progress-bar__dot ${dotClass}`}>
+                  {done ? "\u2713" : stepNum}
+                </div>
+                <div
+                  className={`progress-bar__label ${active
+                    ? "progress-bar__label--active"
+                    : "progress-bar__label--inactive"
+                    }`}
+                >
+                  {label}
+                </div>
+              </div>
+            </div>
+          );
+        })}
+      </div>
+    );
+  }
+
+  // ── Step content ──────────────────────────────────────────────────────────
+
+  function Step1() {
+    return (
+      <>
+        <h2 className="mb-lg">Create your account</h2>
+        <Input
+          label="Email"
+          type="email"
+          value={data.email}
+          onChange={(v) => set("email", v)}
+          disabled={loading}
+          placeholder="you@example.com"
+        />
+        <Input
+          label="Password"
+          type="password"
+          value={data.password}
+          onChange={(v) => set("password", v)}
+          disabled={loading}
+          placeholder="At least 6 characters"
+        />
+        <Input
+          label="Confirm Password"
+          type="password"
+          value={data.confirmPassword}
+          onChange={(v) => set("confirmPassword", v)}
+          disabled={loading}
+          placeholder="Repeat your password"
+          className="form-field--last"
+        />
+      </>
+    );
+  }
+
+  function Step2() {
+    return (
+      <>
+        <h2 className="mb-sm">Add a wallet address</h2>
+        <p className="subscribe__subtitle">
+          Enter the Ethereum address you want to monitor.
+        </p>
+        <Input
+          label="ETH Address"
+          value={data.walletAddress}
+          onChange={(v) => set("walletAddress", v)}
+          disabled={loading}
+          placeholder="0x..."
+        />
+        <Input
+          label="Label (optional)"
+          value={data.walletLabel}
+          onChange={(v) => set("walletLabel", v)}
+          disabled={loading}
+          placeholder="e.g. My main wallet"
+          className="form-field--last"
+        />
+      </>
+    );
+  }
+
+  function Step3() {
+    return (
+      <>
+        <h2 className="mb-sm">Configure alert rules</h2>
+        <p className="subscribe__subtitle">
+          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 className="checkbox-row__nested">
+              <Input
+                type="number"
+                label=""
+                value={data.largeTransferThreshold}
+                onChange={(v) => set("largeTransferThreshold", v)}
+                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 className="checkbox-row__nested">
+              <Input
+                type="number"
+                label=""
+                value={data.balanceBelowThreshold}
+                onChange={(v) => set("balanceBelowThreshold", v)}
+                placeholder="Threshold (ETH)"
+                min="0"
+                step="0.01"
+              />
+            </div>
+          )}
+        </CheckboxRow>
+      </>
+    );
+  }
+
+  function Step4() {
+    return (
+      <>
+        <h2 className="mb-sm">Set up notifications</h2>
+        <p className="subscribe__subtitle">
+          Add at least one channel so you receive alerts. All fields are optional.
+        </p>
+
+        <div className="mb-md">
+          <label className="form-label">
+            Discord Webhook URL{" "}
+            <a
+              href="https://support.discord.com/hc/en-us/articles/228383668"
+              target="_blank"
+              rel="noreferrer"
+              className="help-link"
+            >
+              (how to get one)
+            </a>
+          </label>
+          <Input
+            label=""
+            type="url"
+            value={data.discordWebhookUrl}
+            onChange={(v) => set("discordWebhookUrl", v)}
+            disabled={loading}
+            placeholder="https://discord.com/api/webhooks/..."
+          />
+        </div>
+
+        <div className="mb-md">
+          <label className="form-label">
+            Slack Webhook URL{" "}
+            <a
+              href="https://api.slack.com/messaging/webhooks"
+              target="_blank"
+              rel="noreferrer"
+              className="help-link"
+            >
+              (how to get one)
+            </a>
+          </label>
+          <Input
+            label=""
+            type="url"
+            value={data.slackWebhookUrl}
+            onChange={(v) => set("slackWebhookUrl", v)}
+            disabled={loading}
+            placeholder="https://hooks.slack.com/services/..."
+          />
+        </div>
+
+        <Input
+          label="Email address for alerts"
+          type="email"
+          value={data.notificationEmail}
+          onChange={(v) => set("notificationEmail", v)}
+          disabled={loading}
+          placeholder="you@example.com"
+          className="form-field--last"
+        />
+      </>
+    );
+  }
+
+  function Step5() {
+    const alertCount = data.alertsCreated.length;
+    const hasNotif = data.notificationConfigured;
+
+    return (
+      <>
+        <h2 className="mb-md">You're all set!</h2>
+
+        <div className="subscribe__summary">
+          <p className="subscribe__summary-title">Summary</p>
+          <ul className="subscribe__summary-list">
+            <li>
+              Wallet address added:{" "}
+              <span className="text-mono text-white-sm">
+                {data.walletAddress}
+              </span>
+              {data.walletLabel && ` (${data.walletLabel})`}
+            </li>
+            <li>
+              Alert rules configured:{" "}
+              <span className="text-white">
+                {alertCount > 0 ? `${alertCount} rule${alertCount !== 1 ? "s" : ""}` : "None (skipped)"}
+              </span>
+            </li>
+            <li>
+              Notification channels:{" "}
+              <span className="text-white">
+                {hasNotif ? "Configured" : "Not set up (skipped)"}
+              </span>
+            </li>
+          </ul>
+        </div>
+
+        {hasNotif && (
+          <div className="mb-lg">
+            <Button
+              onClick={handleTestChannels}
+              disabled={testLoading}
+              variant="ghost"
+            >
+              {testLoading ? "Testing..." : "Test All Channels"}
+            </Button>
+
+            {testResults && (
+              <div className="mt-md">
+                {testResults.error ? (
+                  <p className="text-error">{testResults.error}</p>
+                ) : (
+                  <ul className="list-unstyled">
+                    {Object.entries(testResults).map(([channel, result]) => (
+                      <li
+                        key={channel}
+                        className={`test-result ${result.success ? "test-result--success" : "test-result--failure"}`}
+                      >
+                        {result.success ? "\u2713" : "\u2717"} {channel}:{" "}
+                        {result.message || (result.success ? "OK" : "Failed")}
+                      </li>
+                    ))}
+                  </ul>
+                )}
+              </div>
+            )}
+          </div>
+        )}
+
+        <Button onClick={() => navigate("/addresses")} className="btn--lg text-bold">
+          Go to Dashboard →
+        </Button>
+      </>
+    );
+  }
+
+  // ── Shared helpers ────────────────────────────────────────────────────────
+
+  function CheckboxRow({ checked, onChange, label, children }) {
+    return (
+      <div className="checkbox-row">
+        <label className="checkbox-row__label">
+          <input
+            type="checkbox"
+            checked={checked}
+            onChange={(e) => onChange(e.target.checked)}
+            className="checkbox-row__input"
+          />
+          {label}
+        </label>
+        {children}
+      </div>
+    );
+  }
+
+  // ── Footer navigation ─────────────────────────────────────────────────────
+
+  function Footer() {
+    if (step === 5) return null;
+
+    const canSkip = step === 3 || step === 4;
+    const canBack = step > 2;
+
+    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);
+    }
+
+    const nextLabel = step === 1
+      ? "Create Account & Subscribe"
+      : step === 4
+        ? "Finish"
+        : "Next →";
+
+    return (
+      <div className="subscribe__footer">
+        <div>
+          {canBack && (
+            <Button
+              onClick={handleBack}
+              disabled={loading}
+              variant="ghost"
+            >
+              ← Back
+            </Button>
+          )}
+        </div>
+
+        <div className="flex gap-md">
+          {canSkip && (
+            <Button
+              onClick={handleSkip}
+              disabled={loading}
+              variant="ghost"
+            >
+              Skip for now
+            </Button>
+          )}
+          <Button
+            onClick={handleNext}
+            disabled={loading}
+            className="text-bold"
+          >
+            {loading ? "Please wait..." : nextLabel}
+          </Button>
+        </div>
+      </div>
+    );
+  }
+
+  // ── Render ────────────────────────────────────────────────────────────────
+
+  const stepContent = {
+    1: Step1(),
+    2: Step2(),
+    3: Step3(),
+    4: Step4(),
+    5: Step5(),
+  };
+
+  return (
+    <div className="subscribe">
+      <div className="subscribe__container">
+        <h1 className="subscribe__title">Koin Ping</h1>
+
+        {ProgressBar()}
+
+        {error && (
+          <div className="alert alert--error">{error}</div>
+        )}
+
+        {skipWarning && (
+          <div className="alert alert--warning">{skipWarning}</div>
+        )}
+
+        <div className="subscribe__card">
+          {stepContent[step]}
+          {Footer()}
+        </div>
+
+        {step === 1 && (
+          <p className="subscribe__login-link">
+            Already have an account?{" "}
+            <a href="/login">Log in here</a>
+          </p>
+        )}
+      </div>
+    </div>
+  );
+}

frontend/tsconfig.json

@@ -2,10 +2,13 @@
   "compilerOptions": {
     "target": "ES2020",
     "useDefineForClassFields": true,
-        "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "lib": [
+      "ES2020",
+      "DOM",
+      "DOM.Iterable"
+    ],
     "module": "ESNext",
     "skipLibCheck": true,
-
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
@@ -13,12 +16,13 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
-
     /* Linting */
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true
   },
-    "include": ["src"]
+  "include": [
+    "src"
+  ]
 }