fix(tui): way to much to write

.gitignore

@@ -5,9 +5,6 @@
 .env.example
 .env.prod
 
-docs/sca-psd2-compliance.md
-accept-a-payment/
-
 
 FULFILLMENT.md
 .tmp-gocache/

api/handlers/cart.go

@@ -395,7 +395,6 @@ func (h *CartHandler) ConvertCart(w http.ResponseWriter, r *http.Request) {
 		Currency:      stripe.String(string(stripe.CurrencyUSD)),
 		Customer:      stripe.String(user.StripeCustomerID),
 		PaymentMethod: stripe.String(paymentMethodID),
-		OffSession:    stripe.Bool(true),
 		AutomaticPaymentMethods: &stripe.PaymentIntentAutomaticPaymentMethodsParams{
 			Enabled:        stripe.Bool(true),
 			AllowRedirects: stripe.String("never"),
@@ -430,7 +429,7 @@ func (h *CartHandler) ConvertCart(w http.ResponseWriter, r *http.Request) {
 			case stripe.ErrorTypeCard:
 				middleware.RecordCartConversion("card_declined")
 				audit.OrderFailed(userID, order.ID, total, stripeErr.Msg)
-				utils.RespondError(w, http.StatusPaymentRequired, mapStripeCardErrCode(stripeErr.Code), stripeErr.Msg, nil)
+				utils.RespondError(w, http.StatusPaymentRequired, "CARD_DECLINED", stripeErr.Msg, nil)
 			case stripe.ErrorTypeInvalidRequest:
 				middleware.RecordCartConversion("stripe_invalid_request")
 				audit.OrderFailed(userID, order.ID, total, stripeErr.Msg)
@@ -490,36 +489,3 @@ func (h *CartHandler) ConvertCart(w http.ResponseWriter, r *http.Request) {
 		"order": order,
 	})
 }
-
-func mapStripeCardErrCode(code stripe.ErrorCode) string {
-	switch code {
-	case stripe.ErrorCodeAuthenticationRequired:
-		return "AUTHENTICATION_REQUIRED"
-	case "authentication_not_supported":
-		return "AUTHENTICATION_NOT_SUPPORTED"
-	case "card_declined", "":
-		return "CARD_DECLINED"
-	case "expired_card":
-		return "CARD_EXPIRED"
-	case "incorrect_cvc":
-		return "CARD_CVC_FAILED"
-	case "insufficient_funds":
-		return "CARD_INSUFFICIENT_FUNDS"
-	case "processing_error":
-		return "CARD_PROCESSING_ERROR"
-	}
-	return "CARD_DECLINED"
-}
-
-//nolint:unused // wired into Convert cart later
-func appURLForHandler(r *http.Request) string {
-	scheme := "http"
-	if r.TLS != nil || r.Header.Get("X-Forwarded-Proto") == "https" {
-		scheme = "https"
-	}
-	host := r.Host
-	if fh := r.Header.Get("X-Forwarded-Host"); fh != "" {
-		host = fh
-	}
-	return fmt.Sprintf("%s://%s", scheme, host)
-}

api/handlers/orders.go

@@ -145,29 +145,6 @@ func (h *OrderHandler) GetOrders(w http.ResponseWriter, r *http.Request) {
 	})
 }
 
-func (h *OrderHandler) GetOrderStatus(w http.ResponseWriter, r *http.Request) {
-	db := database.GetDB().WithContext(r.Context())
-	userID := middleware.UserIDFromContext(r.Context())
-
-	idStr := chi.URLParam(r, "id")
-	id, err := strconv.ParseUint(idStr, 10, 32)
-	if err != nil {
-		utils.RespondError(w, http.StatusBadRequest, "INVALID_ID", "invalid order id", nil)
-		return
-	}
-
-	var order models.Order
-	if err := db.Where("id = ? AND user_id = ?", id, userID).First(&order).Error; err != nil {
-		utils.RespondError(w, http.StatusNotFound, "ORDER_NOT_FOUND", "order not found", nil)
-		return
-	}
-
-	utils.RespondSuccess(w, http.StatusOK, map[string]any{
-		"id":     order.ID,
-		"status": string(order.Status),
-	})
-}
-
 // RefundOrder issues a full refund for an order via Stripe and marks it as
 // refunded. Only orders in paid or shipped status can be refunded.
 func (h *OrderHandler) RefundOrder(w http.ResponseWriter, r *http.Request) {

api/routes/routes.go

@@ -126,7 +126,6 @@ func SetupRoutes(
 
 			// Orders
 			r.Get("/orders", orderHandler.GetOrders)
-			r.Get("/orders/{id}/status", orderHandler.GetOrderStatus)
 			r.Post("/orders/{id}/refund-request", orderHandler.CreateRefundRequest)
 			r.Post("/orders/{id}/refund", orderHandler.RefundOrder)
 

pkg/api/client.go

@@ -56,6 +56,7 @@ type TokenResponse struct {
 }
 
 func (c *Client) GetOrCreateToken(fingerprint, pubKeyStr, clientSecret string) (string, models.PublicUser, error) {
+
 	url := fmt.Sprintf("%s/api/v1/auth/token", c.BaseURL)
 
 	reqBody := TokenRequest{
@@ -496,40 +497,6 @@ func (c *Client) ConvertCart() (*models.Order, error) {
 	return &convertResp.Data.Order, nil
 }
 
-type OrderStatusResponse struct {
-	Success bool `json:"success"`
-	Data    struct {
-		ID     uint   `json:"id"`
-		Status string `json:"status"`
-	} `json:"data"`
-	Error *APIError `json:"error,omitempty"`
-}
-
-func (c *Client) GetOrderStatus(id uint) (string, error) {
-	url := fmt.Sprintf("%s/api/v1/orders/%d/status", c.BaseURL, id)
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return "", fmt.Errorf("failed to create request: %w", err)
-	}
-	resp, err := c.doRequest(req)
-	if err != nil {
-		return "", fmt.Errorf("failed to fetch order status: %w", err)
-	}
-	defer func() { _ = resp.Body.Close() }()
-
-	var sResp OrderStatusResponse
-	if err := json.NewDecoder(resp.Body).Decode(&sResp); err != nil {
-		return "", fmt.Errorf("failed to decode order status response: %w", err)
-	}
-	if !sResp.Success {
-		if sResp.Error != nil {
-			return "", fmt.Errorf("%s: %s", sResp.Error.Code, sResp.Error.Message)
-		}
-		return "", fmt.Errorf("failed to fetch order status")
-	}
-	return sResp.Data.Status, nil
-}
-
 // GetCards fetches all saved cards for the user.
 func (c *Client) GetCards() ([]models.Card, error) {
 	url := fmt.Sprintf("%s/api/v1/cards", c.BaseURL)

pkg/audit/audit.go

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"log/slog"
-
 	"terminalShop/pkg/models"
 
 	"gorm.io/gorm"
@@ -22,7 +21,6 @@ const (
 	eventOrderPaid              eventType = "order_paid"
 	eventOrderShipped           eventType = "order_shipped"
 	eventOrderFailed            eventType = "order_failed"
-	eventOrderRequiresAction    eventType = "order_requires_action"
 	eventOrderRefunded          eventType = "order_refunded"
 	eventPaymentCritical        eventType = "payment_critical"
 	eventLabelPurchased         eventType = "label_purchased"
@@ -300,15 +298,3 @@ func attrsToMap(a []any) map[string]any {
 	}
 	return m
 }
-
-//nolint:unused // called from ConvertCart in the next update
-func OrderRequiresAction(userID, orderID uint, paymentIntentID string) {
-	e := event{
-		Event:    eventOrderRequiresAction,
-		UserID:   userID,
-		OrderID:  orderID,
-		StripeID: paymentIntentID,
-	}
-	slog.Info("audit", e.attrs()...)
-	persist(orderID, eventOrderRequiresAction, e)
-}

pkg/tui/confirmation.go

@@ -3,7 +3,6 @@ package tui
 import (
 	"fmt"
 	"strings"
-
 	"terminalShop/pkg/models"
 
 	"charm.land/bubbles/v2/viewport"
@@ -193,7 +192,7 @@ func (m Model) ReviewUpdate(msg tea.Msg) (Model, tea.Cmd) {
 		m.CheckingOut = false
 		if msg.Err != nil {
 			m = m.SwitchPage(paymentPage)
-			m.error = &VisibleError{message: friendlyCheckoutError(msg.Err)}
+			m.error = &VisibleError{message: fmt.Sprintf("checkout failed: %v", msg.Err)}
 			m.review.cardJustAdded = false
 			m.payment.view = 0
 			m.payment.form = nil
@@ -235,24 +234,3 @@ func (m Model) ReviewUpdate(msg tea.Msg) (Model, tea.Cmd) {
 	}
 	return m, nil
 }
-
-func friendlyCheckoutError(raw error) string {
-	s := raw.Error()
-	switch {
-	case strings.Contains(s, "AUTHENTICATION_REQUIRED"):
-		return "your bank wants to verify this charge, authentication step coming soon."
-	case strings.Contains(s, "AUTHENTICATION_NOT_SUPPORTED"):
-		return "this card doesn't support online authentication. Try another card"
-	case strings.Contains(s, "CARD_EXPIRED"):
-		return "card expired. Add a new card and try again"
-	case strings.Contains(s, "CARD_CVC_FAILED"):
-		return "card cvc incorrect. Check the back of the card and try again"
-	case strings.Contains(s, "CARD_INSUFFICIENT_FUNDS"):
-		return "insufficient funds on this card"
-	case strings.Contains(s, "CARD_PROCESSING_ERROR"):
-		return "card processing error. Try again in a moment"
-	case strings.Contains(s, "CARD_DECLINED"):
-		return "card declined"
-	}
-	return "checkout failed, try again."
-}

pkg/tui/refund.go

@@ -27,15 +27,6 @@ const (
 	refundTextareaHPad = 4
 )
 
-// Nerd-font glyphs used in the refund composer. Requires a Nerd Font in the
-// SSH client terminal; renders as tofu otherwise.
-const (
-	refundIconUndo    = "\uf0e2" // nf-fa-undo
-	refundIconTag     = "\uf02b" // nf-oct-tag
-	refundIconComment = "\uf41f" // nf-oct-comment
-	refundIconKey     = "\uf11c" // nf-fa-keyboard_o
-)
-
 // refundFocus identifies which field in the refund composer has keyboard focus.
 type refundFocus int
 
@@ -170,7 +161,7 @@ func (m Model) buildRefundForm(state *refundState) *huh.Form {
 func (m Model) newRefundTextarea() textarea.Model {
 	ta := textarea.New()
 	ta.Prompt = ""
-	ta.Placeholder = "Describe the issue"
+	ta.Placeholder = "Describe the issue (optional)..."
 	ta.ShowLineNumbers = true
 	ta.CharLimit = 65536
 	ta.DynamicHeight = false
@@ -178,15 +169,12 @@ func (m Model) newRefundTextarea() textarea.Model {
 	ta.SetWidth(m.refundTextareaWidth())
 
 	base := lipgloss.NewStyle()
-	// Cursor-line uses a darker grey than theme.Border() so the active line
-	// reads as a subtle wash, not a bright bar competing with the highlight.
-	cursorLineBG := lipgloss.Color("236")
 	ta.SetStyles(textarea.Styles{
 		Focused: textarea.StyleState{
 			Base:             base,
 			Text:             base.Foreground(m.theme.Accent()),
 			LineNumber:       base.Foreground(m.theme.Dim()),
-			CursorLine:       base.Background(cursorLineBG).Foreground(m.theme.Accent()),
+			CursorLine:       base.Background(m.theme.Border()).Foreground(m.theme.Accent()),
 			CursorLineNumber: base.Foreground(m.theme.Body()),
 			Placeholder:      base.Foreground(m.theme.Dim()),
 			EndOfBuffer:      base.Foreground(m.theme.Dim()),
@@ -260,19 +248,14 @@ func (m Model) createRefundRequestCmd(orderID uint, gen uint64, reason string, m
 }
 
 // RenderRefundOverlay renders the refund composer as a centered modal.
-// The modal has no border or background fill — only padding for breathing
-// room. lipgloss.Place handles centering against the container.
 func (m Model) RenderRefundOverlay() string {
 	state := &m.refund
 	contentWidth := m.refundContentWidth()
 
-	titleText := fmt.Sprintf("%s  Refund request — Order #%d", refundIconUndo, state.orderID)
 	title := m.theme.TextAccent().
 		Bold(true).
 		Width(contentWidth).
-		Border(lipgloss.NormalBorder(), false, false, true, false).
-		BorderForeground(m.theme.Highlight()).
-		Render(titleText)
+		Render(fmt.Sprintf("Refund request - Order #%d", state.orderID))
 
 	body := lipgloss.JoinVertical(
 		lipgloss.Left,
@@ -286,6 +269,9 @@ func (m Model) RenderRefundOverlay() string {
 	)
 
 	modal := lipgloss.NewStyle().
+		Width(contentWidth).
+		Border(lipgloss.NormalBorder()).
+		BorderForeground(m.theme.Border()).
 		Padding(1, 2).
 		Render(body)
 
@@ -306,7 +292,7 @@ func (m Model) renderRefundReason(state *refundState) string {
 		value = "Select a reason"
 	}
 
-	label := m.theme.TextLabel().Render(refundIconTag + "  Reason")
+	label := m.theme.TextLabel().Render("Reason")
 	selected := m.theme.TextAccent().
 		Border(lipgloss.HiddenBorder()).
 		PaddingLeft(1).
@@ -322,7 +308,7 @@ func (m Model) renderRefundReason(state *refundState) string {
 
 func (m Model) renderRefundTextarea(state *refundState) string {
 	label := "Message (optional)"
-	placeholder := "Describe the issue"
+	placeholder := "Describe the issue (optional)..."
 	if state.reason == models.RefundRequestReasonOther {
 		label = "Message (required)"
 		placeholder = "Describe the issue..."
@@ -335,7 +321,7 @@ func (m Model) renderRefundTextarea(state *refundState) string {
 	}
 
 	wrapper := lipgloss.NewStyle().
-		Border(lipgloss.ThickBorder()).
+		Border(lipgloss.NormalBorder()).
 		BorderForeground(border)
 
 	contentWidth := m.refundContentWidth()
@@ -351,7 +337,7 @@ func (m Model) renderRefundTextarea(state *refundState) string {
 
 	out := lipgloss.JoinVertical(
 		lipgloss.Left,
-		m.theme.TextLabel().Render(refundIconComment+"  "+label),
+		m.theme.TextLabel().Render(label),
 		textareaBox,
 		counter,
 	)
@@ -368,14 +354,7 @@ func (m Model) renderRefundFooter(state *refundState) string {
 	if state.err != "" {
 		return m.theme.TextError().Render(state.err)
 	}
-	key := m.theme.TextHighlight().Bold(true)
-	sep := m.theme.TextDim().Render("  ·  ")
-	dim := m.theme.TextDim()
-	return dim.Render(refundIconKey+"  ") +
-		key.Render("tab") + dim.Render(" next") + sep +
-		key.Render("shift+tab") + dim.Render(" prev") + sep +
-		key.Render("ctrl+s") + dim.Render(" submit") + sep +
-		key.Render("esc") + dim.Render(" cancel")
+	return m.theme.TextDim().Render("tab next field | shift+tab prev | ctrl+s submit | esc cancel")
 }
 
 func (m Model) refundContentWidth() int {

pkg/tui/views.go

@@ -82,10 +82,6 @@ func (m Model) renderString() string {
 		content = loadingStyle.Render("Loading products from API...")
 	} else if m.error != nil {
 		errorStyle := m.theme.PanelError().Padding(0, 1).MarginBottom(1)
-		// soft-wrap long messages instead of clipping.
-		if m.widthContent > 4 {
-			errorStyle = errorStyle.Width(m.widthContent - 4)
-		}
 		errorBanner := errorStyle.Render(m.error.message)
 		content = errorBanner + "\n" + m.buildPageContent(availableContentHeight)
 	} else if m.notice != nil {