Fixes for PostHog

api/billing/fees/internal/service/fees/internal/calculator/impl.go

@@ -90,6 +90,10 @@ func (c *quoteCalculator) Compute(ctx context.Context, plan *model.FeePlan, inte
 		}
 
 		ledgerAccountRef := strings.TrimSpace(rule.LedgerAccountRef)
+		if ledgerAccountRef == "" {
+			c.logger.Warn("fee rule missing ledger account reference", zap.String("rule_id", rule.RuleID))
+			continue
+		}
 
 		amount, scale, calcErr := c.calculateRuleAmount(baseAmount, baseScale, rule)
 		if calcErr != nil {

api/billing/fees/internal/service/fees/internal/resolver/impl.go

@@ -38,23 +38,23 @@ func New(plans storage.PlansStore, logger *zap.Logger) *feeResolver {
 	}
 }
 
-func (r *feeResolver) ResolveFeeRule(ctx context.Context, orgRef *primitive.ObjectID, trigger model.Trigger, at time.Time, attrs map[string]string) (*model.FeePlan, *model.FeeRule, error) {
+func (r *feeResolver) ResolveFeeRule(ctx context.Context, orgID *primitive.ObjectID, trigger model.Trigger, at time.Time, attrs map[string]string) (*model.FeePlan, *model.FeeRule, error) {
 	if r.plans == nil {
 		return nil, nil, merrors.InvalidArgument("fees: plans store is required")
 	}
 
 	// Try org-specific first if provided.
-	if orgRef != nil && !orgRef.IsZero() {
-		if plan, err := r.getOrgPlan(ctx, *orgRef, at); err == nil {
+	if orgID != nil && !orgID.IsZero() {
+		if plan, err := r.getOrgPlan(ctx, *orgID, at); err == nil {
 			if rule, selErr := selectRule(plan, trigger, at, attrs); selErr == nil {
 				return plan, rule, nil
 			} else if !errors.Is(selErr, ErrNoFeeRuleFound) {
-				r.logger.Warn("failed selecting rule for org plan", zap.Error(selErr), zap.String("org_ref", orgRef.Hex()))
+				r.logger.Warn("failed selecting rule for org plan", zap.Error(selErr), zap.String("org_ref", orgID.Hex()))
 				return nil, nil, selErr
 			}
-			r.logger.Debug("no matching rule in org plan; falling back to global", zap.String("org_ref", orgRef.Hex()))
+			r.logger.Debug("no matching rule in org plan; falling back to global", zap.String("org_ref", orgID.Hex()))
 		} else if !errors.Is(err, storage.ErrFeePlanNotFound) {
-			r.logger.Warn("failed resolving org fee plan", zap.Error(err), zap.String("org_ref", orgRef.Hex()))
+			r.logger.Warn("failed resolving org fee plan", zap.Error(err), zap.String("org_ref", orgID.Hex()))
 			return nil, nil, err
 		}
 	}

api/billing/fees/internal/service/fees/internal/resolver/resolver_test.go

@@ -32,8 +32,8 @@ func TestResolver_GlobalFallbackWhenOrgMissing(t *testing.T) {
 	if err != nil {
 		t.Fatalf("expected fallback to global, got error: %v", err)
 	}
-	if plan.OrganizationRef != nil && !plan.OrganizationRef.IsZero() {
-		t.Fatalf("expected global plan, got orgRef %s", plan.OrganizationRef.Hex())
+	if !plan.GetOrganizationRef().IsZero() {
+		t.Fatalf("expected global plan, got orgRef %s", plan.GetOrganizationRef().Hex())
 	}
 	if rule.RuleID != "global_capture" {
 		t.Fatalf("unexpected rule selected: %s", rule.RuleID)
@@ -59,7 +59,8 @@ func TestResolver_OrgOverridesGlobal(t *testing.T) {
 			{RuleID: "org_capture", Trigger: model.TriggerCapture, Priority: 10, Percentage: "0.03", EffectiveFrom: now.Add(-time.Hour)},
 		},
 	}
-	orgPlan.OrganizationRef = &org
+	orgPlan.SetOrganizationRef(org)
+
 	store := &memoryPlansStore{plans: []*model.FeePlan{globalPlan, orgPlan}}
 	resolver := New(store, zap.NewNop())
 
@@ -94,7 +95,7 @@ func TestResolver_SelectsHighestPriority(t *testing.T) {
 			{RuleID: "high", Trigger: model.TriggerCapture, Priority: 200, Percentage: "0.03", EffectiveFrom: now.Add(-time.Hour)},
 		},
 	}
-	plan.OrganizationRef = &org
+	plan.SetOrganizationRef(org)
 
 	store := &memoryPlansStore{plans: []*model.FeePlan{plan}}
 	resolver := New(store, zap.NewNop())
@@ -135,7 +136,7 @@ func TestResolver_EffectiveDateFiltering(t *testing.T) {
 			{RuleID: "expired", Trigger: model.TriggerCapture, Priority: 100, Percentage: "0.05", EffectiveFrom: past, EffectiveTo: &past},
 		},
 	}
-	orgPlan.OrganizationRef = &org
+	orgPlan.SetOrganizationRef(org)
 
 	globalPlan := &model.FeePlan{
 		Active:        true,
@@ -220,7 +221,7 @@ func TestResolver_MultipleActivePlansConflict(t *testing.T) {
 			{RuleID: "r1", Trigger: model.TriggerCapture, Priority: 10, Percentage: "0.05", EffectiveFrom: now.Add(-time.Hour)},
 		},
 	}
-	p1.OrganizationRef = &org
+	p1.SetOrganizationRef(org)
 	p2 := &model.FeePlan{
 		Active:        true,
 		EffectiveFrom: now.Add(-30 * time.Minute),
@@ -228,7 +229,7 @@ func TestResolver_MultipleActivePlansConflict(t *testing.T) {
 			{RuleID: "r2", Trigger: model.TriggerCapture, Priority: 20, Percentage: "0.03", EffectiveFrom: now.Add(-time.Hour)},
 		},
 	}
-	p2.OrganizationRef = &org
+	p2.SetOrganizationRef(org)
 
 	store := &memoryPlansStore{plans: []*model.FeePlan{p1, p2}}
 	resolver := New(store, zap.NewNop())
@@ -262,7 +263,7 @@ func (m *memoryPlansStore) GetActivePlan(ctx context.Context, orgRef primitive.O
 func (m *memoryPlansStore) FindActiveOrgPlan(_ context.Context, orgRef primitive.ObjectID, at time.Time) (*model.FeePlan, error) {
 	var matches []*model.FeePlan
 	for _, plan := range m.plans {
-		if plan == nil || plan.OrganizationRef == nil || plan.OrganizationRef.IsZero() || (*plan.OrganizationRef != orgRef) {
+		if plan == nil || plan.GetOrganizationRef() != orgRef {
 			continue
 		}
 		if !plan.Active {
@@ -288,7 +289,7 @@ func (m *memoryPlansStore) FindActiveOrgPlan(_ context.Context, orgRef primitive
 func (m *memoryPlansStore) FindActiveGlobalPlan(_ context.Context, at time.Time) (*model.FeePlan, error) {
 	var matches []*model.FeePlan
 	for _, plan := range m.plans {
-		if plan == nil || ((plan.OrganizationRef != nil) && !plan.OrganizationRef.IsZero()) {
+		if plan == nil || !plan.GetOrganizationRef().IsZero() {
 			continue
 		}
 		if !plan.Active {

api/billing/fees/internal/service/fees/logging.go

@@ -1,88 +0,0 @@
-package fees
-
-import (
-	"strings"
-	"time"
-
-	feesv1 "github.com/tech/sendico/pkg/proto/billing/fees/v1"
-	tracev1 "github.com/tech/sendico/pkg/proto/common/trace/v1"
-	"go.uber.org/zap"
-)
-
-func requestLogFields(meta *feesv1.RequestMeta, intent *feesv1.Intent) []zap.Field {
-	fields := logFieldsFromRequestMeta(meta)
-	fields = append(fields, logFieldsFromIntent(intent)...)
-	return fields
-}
-
-func logFieldsFromRequestMeta(meta *feesv1.RequestMeta) []zap.Field {
-	if meta == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 4)
-	if org := strings.TrimSpace(meta.GetOrganizationRef()); org != "" {
-		fields = append(fields, zap.String("organization_ref", org))
-	}
-	fields = append(fields, logFieldsFromTrace(meta.GetTrace())...)
-	return fields
-}
-
-func logFieldsFromIntent(intent *feesv1.Intent) []zap.Field {
-	if intent == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 5)
-	if trigger := intent.GetTrigger(); trigger != feesv1.Trigger_TRIGGER_UNSPECIFIED {
-		fields = append(fields, zap.String("trigger", trigger.String()))
-	}
-	if base := intent.GetBaseAmount(); base != nil {
-		if amount := strings.TrimSpace(base.GetAmount()); amount != "" {
-			fields = append(fields, zap.String("base_amount", amount))
-		}
-		if currency := strings.TrimSpace(base.GetCurrency()); currency != "" {
-			fields = append(fields, zap.String("base_currency", currency))
-		}
-	}
-	if booked := intent.GetBookedAt(); booked != nil && booked.IsValid() {
-		fields = append(fields, zap.Time("booked_at", booked.AsTime()))
-	}
-	if attrs := intent.GetAttributes(); len(attrs) > 0 {
-		fields = append(fields, zap.Int("attributes_count", len(attrs)))
-	}
-	return fields
-}
-
-func logFieldsFromTrace(trace *tracev1.TraceContext) []zap.Field {
-	if trace == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 3)
-	if reqRef := strings.TrimSpace(trace.GetRequestRef()); reqRef != "" {
-		fields = append(fields, zap.String("request_ref", reqRef))
-	}
-	if idem := strings.TrimSpace(trace.GetIdempotencyKey()); idem != "" {
-		fields = append(fields, zap.String("idempotency_key", idem))
-	}
-	if traceRef := strings.TrimSpace(trace.GetTraceRef()); traceRef != "" {
-		fields = append(fields, zap.String("trace_ref", traceRef))
-	}
-	return fields
-}
-
-func logFieldsFromTokenPayload(payload *feeQuoteTokenPayload) []zap.Field {
-	if payload == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 6)
-	if org := strings.TrimSpace(payload.OrganizationRef); org != "" {
-		fields = append(fields, zap.String("organization_ref", org))
-	}
-	if payload.ExpiresAtUnixMs > 0 {
-		fields = append(fields,
-			zap.Int64("expires_at_unix_ms", payload.ExpiresAtUnixMs),
-			zap.Time("expires_at", time.UnixMilli(payload.ExpiresAtUnixMs)))
-	}
-	fields = append(fields, logFieldsFromIntent(payload.Intent)...)
-	fields = append(fields, logFieldsFromTrace(payload.Trace)...)
-	return fields
-}

api/billing/fees/internal/service/fees/service.go

@@ -72,57 +72,26 @@ func (s *Service) Register(router routers.GRPC) error {
 }
 
 func (s *Service) QuoteFees(ctx context.Context, req *feesv1.QuoteFeesRequest) (resp *feesv1.QuoteFeesResponse, err error) {
-	var (
-		meta   *feesv1.RequestMeta
-		intent *feesv1.Intent
-	)
-	if req != nil {
-		meta = req.GetMeta()
-		intent = req.GetIntent()
-	}
-	logger := s.logger.With(requestLogFields(meta, intent)...)
-
 	start := s.clock.Now()
 	trigger := feesv1.Trigger_TRIGGER_UNSPECIFIED
-	if intent != nil {
-		trigger = intent.GetTrigger()
+	if req != nil && req.GetIntent() != nil {
+		trigger = req.GetIntent().GetTrigger()
 	}
 	var fxUsed bool
 	defer func() {
 		statusLabel := statusFromError(err)
-		linesCount := 0
-		appliedCount := 0
 		if err == nil && resp != nil {
 			fxUsed = resp.GetFxUsed() != nil
-			linesCount = len(resp.GetLines())
-			appliedCount = len(resp.GetApplied())
 		}
 		observeMetrics("quote", trigger, statusLabel, fxUsed, time.Since(start))
-
-		logFields := []zap.Field{
-			zap.String("status", statusLabel),
-			zap.Duration("duration", time.Since(start)),
-			zap.Bool("fx_used", fxUsed),
-			zap.String("trigger", trigger.String()),
-			zap.Int("lines", linesCount),
-			zap.Int("applied_rules", appliedCount),
-		}
-		if err != nil {
-			logger.Warn("QuoteFees finished", append(logFields, zap.Error(err))...)
-			return
-		}
-		logger.Info("QuoteFees finished", logFields...)
 	}()
 
-	logger.Debug("QuoteFees request received")
-
 	if err = s.validateQuoteRequest(req); err != nil {
 		return nil, err
 	}
 
 	orgRef, parseErr := primitive.ObjectIDFromHex(req.GetMeta().GetOrganizationRef())
 	if parseErr != nil {
-		logger.Warn("QuoteFees invalid organization_ref", zap.Error(parseErr))
 		err = status.Error(codes.InvalidArgument, "invalid organization_ref")
 		return nil, err
 	}
@@ -143,59 +112,20 @@ func (s *Service) QuoteFees(ctx context.Context, req *feesv1.QuoteFeesRequest) (
 }
 
 func (s *Service) PrecomputeFees(ctx context.Context, req *feesv1.PrecomputeFeesRequest) (resp *feesv1.PrecomputeFeesResponse, err error) {
-	var (
-		meta   *feesv1.RequestMeta
-		intent *feesv1.Intent
-	)
-	if req != nil {
-		meta = req.GetMeta()
-		intent = req.GetIntent()
-	}
-	logger := s.logger.With(requestLogFields(meta, intent)...)
-
 	start := s.clock.Now()
 	trigger := feesv1.Trigger_TRIGGER_UNSPECIFIED
-	if intent != nil {
-		trigger = intent.GetTrigger()
+	if req != nil && req.GetIntent() != nil {
+		trigger = req.GetIntent().GetTrigger()
 	}
-	var (
-		fxUsed    bool
-		expiresAt time.Time
-	)
+	var fxUsed bool
 	defer func() {
 		statusLabel := statusFromError(err)
-		linesCount := 0
-		appliedCount := 0
 		if err == nil && resp != nil {
 			fxUsed = resp.GetFxUsed() != nil
-			linesCount = len(resp.GetLines())
-			appliedCount = len(resp.GetApplied())
-			if ts := resp.GetExpiresAt(); ts != nil {
-				expiresAt = ts.AsTime()
-			}
 		}
 		observeMetrics("precompute", trigger, statusLabel, fxUsed, time.Since(start))
-
-		logFields := []zap.Field{
-			zap.String("status", statusLabel),
-			zap.Duration("duration", time.Since(start)),
-			zap.Bool("fx_used", fxUsed),
-			zap.String("trigger", trigger.String()),
-			zap.Int("lines", linesCount),
-			zap.Int("applied_rules", appliedCount),
-		}
-		if !expiresAt.IsZero() {
-			logFields = append(logFields, zap.Time("expires_at", expiresAt))
-		}
-		if err != nil {
-			logger.Warn("PrecomputeFees finished", append(logFields, zap.Error(err))...)
-			return
-		}
-		logger.Info("PrecomputeFees finished", logFields...)
 	}()
 
-	logger.Debug("PrecomputeFees request received")
-
 	if err = s.validatePrecomputeRequest(req); err != nil {
 		return nil, err
 	}
@@ -204,7 +134,6 @@ func (s *Service) PrecomputeFees(ctx context.Context, req *feesv1.PrecomputeFees
 
 	orgRef, parseErr := primitive.ObjectIDFromHex(req.GetMeta().GetOrganizationRef())
 	if parseErr != nil {
-		logger.Warn("PrecomputeFees invalid organization_ref", zap.Error(parseErr))
 		err = status.Error(codes.InvalidArgument, "invalid organization_ref")
 		return nil, err
 	}
@@ -219,7 +148,7 @@ func (s *Service) PrecomputeFees(ctx context.Context, req *feesv1.PrecomputeFees
 	if ttl <= 0 {
 		ttl = 60000
 	}
-	expiresAt = now.Add(time.Duration(ttl) * time.Millisecond)
+	expiresAt := now.Add(time.Duration(ttl) * time.Millisecond)
 
 	payload := feeQuoteTokenPayload{
 		OrganizationRef: req.GetMeta().GetOrganizationRef(),
@@ -230,7 +159,7 @@ func (s *Service) PrecomputeFees(ctx context.Context, req *feesv1.PrecomputeFees
 
 	var token string
 	if token, err = encodeTokenPayload(payload); err != nil {
-		logger.Warn("failed to encode fee quote token", zap.Error(err))
+		s.logger.Warn("failed to encode fee quote token", zap.Error(err))
 		err = status.Error(codes.Internal, "failed to encode fee quote token")
 		return nil, err
 	}
@@ -247,18 +176,9 @@ func (s *Service) PrecomputeFees(ctx context.Context, req *feesv1.PrecomputeFees
 }
 
 func (s *Service) ValidateFeeToken(ctx context.Context, req *feesv1.ValidateFeeTokenRequest) (resp *feesv1.ValidateFeeTokenResponse, err error) {
-	tokenLen := 0
-	if req != nil {
-		tokenLen = len(strings.TrimSpace(req.GetFeeQuoteToken()))
-	}
-	logger := s.logger.With(zap.Int("token_length", tokenLen))
-
 	start := s.clock.Now()
 	trigger := feesv1.Trigger_TRIGGER_UNSPECIFIED
-	var (
-		fxUsed       bool
-		resultReason string
-	)
+	var fxUsed bool
 	defer func() {
 		statusLabel := statusFromError(err)
 		if err == nil && resp != nil {
@@ -271,28 +191,9 @@ func (s *Service) ValidateFeeToken(ctx context.Context, req *feesv1.ValidateFeeT
 			}
 		}
 		observeMetrics("validate", trigger, statusLabel, fxUsed, time.Since(start))
-
-		logFields := []zap.Field{
-			zap.String("status", statusLabel),
-			zap.Duration("duration", time.Since(start)),
-			zap.Bool("fx_used", fxUsed),
-			zap.String("trigger", trigger.String()),
-			zap.Bool("valid", resp != nil && resp.GetValid()),
-		}
-		if resultReason != "" {
-			logFields = append(logFields, zap.String("reason", resultReason))
-		}
-		if err != nil {
-			logger.Warn("ValidateFeeToken finished", append(logFields, zap.Error(err))...)
-			return
-		}
-		logger.Info("ValidateFeeToken finished", logFields...)
 	}()
 
-	logger.Debug("ValidateFeeToken request received")
-
 	if req == nil || strings.TrimSpace(req.GetFeeQuoteToken()) == "" {
-		resultReason = "missing_token"
 		err = status.Error(codes.InvalidArgument, "fee_quote_token is required")
 		return nil, err
 	}
@@ -301,29 +202,21 @@ func (s *Service) ValidateFeeToken(ctx context.Context, req *feesv1.ValidateFeeT
 
 	payload, decodeErr := decodeTokenPayload(req.GetFeeQuoteToken())
 	if decodeErr != nil {
-		resultReason = "invalid_token"
-		logger.Warn("failed to decode fee quote token", zap.Error(decodeErr))
+		s.logger.Warn("failed to decode fee quote token", zap.Error(decodeErr))
 		resp = &feesv1.ValidateFeeTokenResponse{Meta: &feesv1.ResponseMeta{}, Valid: false, Reason: "invalid_token"}
 		return resp, nil
 	}
 
-	logger = logger.With(logFieldsFromTokenPayload(&payload)...)
-
-	if payload.Intent != nil {
 	trigger = payload.Intent.GetTrigger()
-	}
 
 	if now.UnixMilli() > payload.ExpiresAtUnixMs {
-		resultReason = "expired"
-		logger.Info("fee quote token expired")
 		resp = &feesv1.ValidateFeeTokenResponse{Meta: &feesv1.ResponseMeta{}, Valid: false, Reason: "expired"}
 		return resp, nil
 	}
 
 	orgRef, parseErr := primitive.ObjectIDFromHex(payload.OrganizationRef)
 	if parseErr != nil {
-		resultReason = "invalid_token"
-		logger.Warn("token contained invalid organization reference", zap.Error(parseErr))
+		s.logger.Warn("token contained invalid organization reference", zap.Error(parseErr))
 		resp = &feesv1.ValidateFeeTokenResponse{Meta: &feesv1.ResponseMeta{}, Valid: false, Reason: "invalid_token"}
 		return resp, nil
 	}
@@ -387,16 +280,6 @@ func (s *Service) computeQuoteWithTime(ctx context.Context, orgRef primitive.Obj
 		bookedAt = intent.GetBookedAt().AsTime()
 	}
 
-	logFields := []zap.Field{
-		zap.Time("booked_at_used", bookedAt),
-	}
-	if !orgRef.IsZero() {
-		logFields = append(logFields, zap.String("organization_ref", orgRef.Hex()))
-	}
-	logFields = append(logFields, logFieldsFromIntent(intent)...)
-	logFields = append(logFields, logFieldsFromTrace(trace)...)
-	logger := s.logger.With(logFields...)
-
 	var orgPtr *primitive.ObjectID
 	if !orgRef.IsZero() {
 		orgPtr = &orgRef
@@ -414,7 +297,7 @@ func (s *Service) computeQuoteWithTime(ctx context.Context, orgRef primitive.Obj
 		case errors.Is(err, storage.ErrFeePlanNotFound):
 			return nil, nil, nil, status.Error(codes.NotFound, "fee plan not found")
 		default:
-			logger.Warn("failed to resolve fee rule", zap.Error(err))
+			s.logger.Warn("failed to resolve fee rule", zap.Error(err))
 			return nil, nil, nil, status.Error(codes.Internal, "failed to resolve fee rule")
 		}
 	}
@@ -430,7 +313,7 @@ func (s *Service) computeQuoteWithTime(ctx context.Context, orgRef primitive.Obj
 		if errors.Is(calcErr, merrors.ErrInvalidArg) {
 			return nil, nil, nil, status.Error(codes.InvalidArgument, calcErr.Error())
 		}
-		logger.Warn("failed to compute fee quote", zap.Error(calcErr))
+		s.logger.Warn("failed to compute fee quote", zap.Error(calcErr))
 		return nil, nil, nil, status.Error(codes.Internal, "failed to compute fee quote")
 	}
 

api/billing/fees/internal/service/fees/service_test.go

@@ -49,7 +49,7 @@ func TestQuoteFees_ComputesDerivedLines(t *testing.T) {
 		},
 	}
 	plan.SetID(primitive.NewObjectID())
-	plan.OrganizationRef = &orgRef
+	plan.SetOrganizationRef(orgRef)
 
 	service := NewService(
 		zap.NewNop(),
@@ -163,7 +163,7 @@ func TestQuoteFees_FiltersByAttributesAndDates(t *testing.T) {
 		},
 	}
 	plan.SetID(primitive.NewObjectID())
-	plan.OrganizationRef = &orgRef
+	plan.SetOrganizationRef(orgRef)
 
 	service := NewService(
 		zap.NewNop(),
@@ -224,7 +224,7 @@ func TestQuoteFees_RoundingDown(t *testing.T) {
 		},
 	}
 	plan.SetID(primitive.NewObjectID())
-	plan.OrganizationRef = &orgRef
+	plan.SetOrganizationRef(orgRef)
 
 	service := NewService(
 		zap.NewNop(),
@@ -277,7 +277,7 @@ func TestQuoteFees_UsesInjectedCalculator(t *testing.T) {
 		},
 	}
 	plan.SetID(primitive.NewObjectID())
-	plan.OrganizationRef = &orgRef
+	plan.SetOrganizationRef(orgRef)
 
 	result := &types.CalculationResult{
 		Lines: []*feesv1.DerivedPostingLine{
@@ -353,7 +353,7 @@ func TestQuoteFees_PopulatesFxUsed(t *testing.T) {
 		},
 	}
 	plan.SetID(primitive.NewObjectID())
-	plan.OrganizationRef = &orgRef
+	plan.SetOrganizationRef(orgRef)
 
 	fakeOracle := &oracleclient.Fake{
 		LatestRateFn: func(ctx context.Context, req oracleclient.LatestRateParams) (*oracleclient.RateSnapshot, error) {
@@ -452,7 +452,7 @@ func (s *stubPlansStore) FindActiveOrgPlan(_ context.Context, orgRef primitive.O
 	if s.plan == nil {
 		return nil, storage.ErrFeePlanNotFound
 	}
-	if (s.plan.OrganizationRef != nil) && (*s.plan.OrganizationRef != orgRef) {
+	if s.plan.GetOrganizationRef() != orgRef {
 		return nil, storage.ErrFeePlanNotFound
 	}
 	if !s.plan.Active {

api/billing/fees/storage/model/plan.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/tech/sendico/pkg/db/storable"
 	"github.com/tech/sendico/pkg/model"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 const (
@@ -27,8 +26,8 @@ const (
 // FeePlan describes a collection of fee rules for an organisation.
 type FeePlan struct {
 	storable.Base               `bson:",inline" json:",inline"`
+	model.OrganizationBoundBase `bson:",inline" json:",inline"`
 	model.Describable           `bson:",inline" json:",inline"`
-	OrganizationRef   *primitive.ObjectID `bson:"organizationRef,omitempty" json:"organizationRef,omitempty"`
 	Active                      bool              `bson:"active"             json:"active"`
 	EffectiveFrom               time.Time         `bson:"effectiveFrom"      json:"effectiveFrom"`
 	EffectiveTo                 *time.Time        `bson:"effectiveTo,omitempty" json:"effectiveTo,omitempty"`

api/fx/ingestor/internal/ingestor/service.go

@@ -85,7 +85,6 @@ func (s *Service) executePoll(ctx context.Context) error {
 
 func (s *Service) pollOnce(ctx context.Context) error {
 	var firstErr error
-	failures := 0
 	for _, pair := range s.pairs {
 		start := time.Now()
 		err := s.upsertPair(ctx, pair)
@@ -97,24 +96,14 @@ func (s *Service) pollOnce(ctx context.Context) error {
 			if firstErr == nil {
 				firstErr = err
 			}
-			failures++
 			s.logger.Warn("Failed to ingest pair",
 				zap.String("symbol", pair.Symbol),
 				zap.String("source", pair.Source.String()),
-				zap.String("provider", pair.Provider),
-				zap.String("base", pair.Base),
-				zap.String("quote", pair.Quote),
-				zap.Bool("invert", pair.Invert),
 				zap.Duration("elapsed", elapsed),
 				zap.Error(err),
 			)
 		}
 	}
-	if failures > 0 {
-		s.logger.Warn("Ingestion poll completed with failures", zap.Int("failures", failures), zap.Int("total", len(s.pairs)))
-	} else {
-		s.logger.Info("Ingestion poll completed", zap.Int("total", len(s.pairs)))
-	}
 	return firstErr
 }
 
@@ -126,7 +115,7 @@ func (s *Service) upsertPair(ctx context.Context, pair config.Pair) error {
 
 	ticker, err := connector.FetchTicker(ctx, pair.Symbol)
 	if err != nil {
-		return merrors.InternalWrap(err, "fetch ticker: "+pair.Symbol)
+		return merrors.InternalWrap(err, "fetch ticker")
 	}
 
 	bid, err := parseDecimal(ticker.BidPrice)
@@ -183,14 +172,9 @@ func (s *Service) upsertPair(ctx context.Context, pair config.Pair) error {
 	s.logger.Debug("Snapshot ingested",
 		zap.String("pair", pair.Base+"/"+pair.Quote),
 		zap.String("provider", pair.Provider),
-		zap.String("source", pair.Source.String()),
-		zap.String("provider_ref", snapshot.ProviderRef),
 		zap.String("bid", snapshot.Bid),
 		zap.String("ask", snapshot.Ask),
 		zap.String("mid", snapshot.Mid),
-		zap.String("spread_bps", snapshot.SpreadBps),
-		zap.Int64("asof_unix_ms", snapshot.AsOfUnixMs),
-		zap.String("rate_ref", snapshot.RateRef),
 	)
 
 	return nil

api/fx/ingestor/internal/market/cbr/connector.go

@@ -168,13 +168,13 @@ func (c *cbrConnector) refreshDirectory() error {
 
 	resp, err := c.client.Do(req)
 	if err != nil {
-		c.logger.Warn("CBR directory request failed", zap.Error(err), zap.String("endpoint", endpoint))
+		c.logger.Warn("CBR directory request failed", zap.Error(err))
 		return merrors.InternalWrap(err, "cbr: directory request failed")
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		c.logger.Warn("CBR directory returned non-OK status", zap.Int("status", resp.StatusCode), zap.String("endpoint", endpoint))
+		c.logger.Warn("CBR directory returned non-OK status", zap.Int("status", resp.StatusCode))
 		return merrors.Internal("cbr: unexpected status " + strconv.Itoa(resp.StatusCode))
 	}
 
@@ -183,7 +183,7 @@ func (c *cbrConnector) refreshDirectory() error {
 
 	var directory valuteDirectory
 	if err := decoder.Decode(&directory); err != nil {
-		c.logger.Warn("CBR directory decode failed", zap.Error(err), zap.String("endpoint", endpoint))
+		c.logger.Warn("CBR directory decode failed", zap.Error(err))
 		return merrors.InternalWrap(err, "cbr: decode directory")
 	}
 

api/fx/ingestor/main.go

@@ -40,15 +40,15 @@ func main() {
 
 	application, err := app.New(logger, *configFile)
 	if err != nil {
-		logger.Error("Failed to initialise application", zap.Error(err))
-	} else {
+		logger.Fatal("Failed to initialise application", zap.Error(err))
+	}
+
 	if err := application.Run(ctx); err != nil {
 		if errors.Is(err, context.Canceled) {
 			logger.Info("FX ingestor stopped")
 			return
 		}
-			logger.Error("Ingestor terminated with error", zap.Error(err))
-		}
+		logger.Fatal("Ingestor terminated with error", zap.Error(err))
 	}
 
 	logger.Info("FX ingestor stopped")

api/fx/oracle/internal/service/oracle/logging.go

@@ -1,90 +0,0 @@
-package oracle
-
-import (
-	"strings"
-
-	fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1"
-	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
-	tracev1 "github.com/tech/sendico/pkg/proto/common/trace/v1"
-	oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1"
-	"go.uber.org/zap"
-)
-
-func quoteRequestFields(req *oraclev1.GetQuoteRequest) []zap.Field {
-	if req == nil {
-		return nil
-	}
-	fields := requestMetaFields(req.GetMeta())
-	if pair := req.GetPair(); pair != nil {
-		if base := strings.TrimSpace(pair.GetBase()); base != "" {
-			fields = append(fields, zap.String("pair_base", base))
-		}
-		if quote := strings.TrimSpace(pair.GetQuote()); quote != "" {
-			fields = append(fields, zap.String("pair_quote", quote))
-		}
-	}
-	if side := req.GetSide(); side != fxv1.Side_SIDE_UNSPECIFIED {
-		fields = append(fields, zap.String("side", side.String()))
-	}
-	if req.GetFirm() {
-		fields = append(fields, zap.Bool("firm", req.GetFirm()))
-	}
-	if ttl := req.GetTtlMs(); ttl > 0 {
-		fields = append(fields, zap.Int64("ttl_ms", ttl))
-	}
-	if maxAge := req.GetMaxAgeMs(); maxAge > 0 {
-		fields = append(fields, zap.Int32("max_age_ms", maxAge))
-	}
-	if provider := strings.TrimSpace(req.GetPreferredProvider()); provider != "" {
-		fields = append(fields, zap.String("preferred_provider", provider))
-	}
-	fields = append(fields, moneyFields("base_amount", req.GetBaseAmount())...)
-	fields = append(fields, moneyFields("quote_amount", req.GetQuoteAmount())...)
-	return fields
-}
-
-func requestMetaFields(meta *oraclev1.RequestMeta) []zap.Field {
-	if meta == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 4)
-	if org := strings.TrimSpace(meta.GetOrganizationRef()); org != "" {
-		fields = append(fields, zap.String("organization_ref", org))
-	}
-	if tenant := strings.TrimSpace(meta.GetTenantRef()); tenant != "" {
-		fields = append(fields, zap.String("tenant_ref", tenant))
-	}
-	fields = append(fields, traceFields(meta.GetTrace())...)
-	return fields
-}
-
-func moneyFields(prefix string, money *moneyv1.Money) []zap.Field {
-	if money == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 2)
-	if amt := strings.TrimSpace(money.GetAmount()); amt != "" {
-		fields = append(fields, zap.String(prefix, amt))
-	}
-	if ccy := strings.TrimSpace(money.GetCurrency()); ccy != "" {
-		fields = append(fields, zap.String(prefix+"_currency", ccy))
-	}
-	return fields
-}
-
-func traceFields(trace *tracev1.TraceContext) []zap.Field {
-	if trace == nil {
-		return nil
-	}
-	fields := make([]zap.Field, 0, 3)
-	if ref := strings.TrimSpace(trace.GetTraceRef()); ref != "" {
-		fields = append(fields, zap.String("trace_ref", ref))
-	}
-	if idem := strings.TrimSpace(trace.GetIdempotencyKey()); idem != "" {
-		fields = append(fields, zap.String("idempotency_key", idem))
-	}
-	if req := strings.TrimSpace(trace.GetRequestRef()); req != "" {
-		fields = append(fields, zap.String("request_ref", req))
-	}
-	return fields
-}

api/fx/oracle/internal/service/oracle/service.go

@@ -101,27 +101,22 @@ func (s *Service) getQuoteResponder(ctx context.Context, req *oraclev1.GetQuoteR
 	if req == nil {
 		req = &oraclev1.GetQuoteRequest{}
 	}
-	logger := s.logger.With(quoteRequestFields(req)...)
-	logger.Debug("Handling GetQuote")
+	s.logger.Debug("Handling GetQuote", zap.String("pair", req.GetPair().GetBase()+"/"+req.GetPair().GetQuote()), zap.Bool("firm", req.GetFirm()))
 	if req.GetSide() == fxv1.Side_SIDE_UNSPECIFIED {
-		logger.Warn("GetQuote invalid: side missing")
 		return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, errSideRequired)
 	}
 	if req.GetBaseAmount() != nil && req.GetQuoteAmount() != nil {
-		logger.Warn("GetQuote invalid: both base_amount and quote_amount provided")
 		return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, errAmountsMutuallyExclusive)
 	}
 	if req.GetBaseAmount() == nil && req.GetQuoteAmount() == nil {
-		logger.Warn("GetQuote invalid: amount missing")
 		return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, errAmountRequired)
 	}
 	if err := s.pingStorage(ctx); err != nil {
-		logger.Warn("Storage unavailable during GetQuote", zap.Error(err))
+		s.logger.Warn("Storage unavailable during GetQuote", zap.Error(err))
 		return gsresponse.Unavailable[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 	}
 	pairMsg := req.GetPair()
 	if pairMsg == nil || strings.TrimSpace(pairMsg.GetBase()) == "" || strings.TrimSpace(pairMsg.GetQuote()) == "" {
-		logger.Warn("GetQuote invalid: pair missing")
 		return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, errEmptyRequest)
 	}
 	pairKey := model.CurrencyPair{Base: strings.ToUpper(pairMsg.GetBase()), Quote: strings.ToUpper(pairMsg.GetQuote())}
@@ -130,10 +125,8 @@ func (s *Service) getQuoteResponder(ctx context.Context, req *oraclev1.GetQuoteR
 	if err != nil {
 		switch {
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("pair not supported", zap.String("pair", pairKey.Base+"/"+pairKey.Quote))
 			return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, merrors.InvalidArgument("pair_not_supported"))
 		default:
-			logger.Warn("GetQuote failed to load pair", zap.Error(err))
 			return gsresponse.Internal[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -150,10 +143,8 @@ func (s *Service) getQuoteResponder(ctx context.Context, req *oraclev1.GetQuoteR
 	if err != nil {
 		switch {
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("rate not found", zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", provider))
 			return gsresponse.FailedPrecondition[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, "rate_not_found", err)
 		default:
-			logger.Warn("GetQuote failed to load rate", zap.Error(err), zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", provider))
 			return gsresponse.Internal[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -162,31 +153,27 @@ func (s *Service) getQuoteResponder(ctx context.Context, req *oraclev1.GetQuoteR
 	if maxAge := req.GetMaxAgeMs(); maxAge > 0 {
 		age := now.UnixMilli() - rate.AsOfUnixMs
 		if age > int64(maxAge) {
-			logger.Warn("Rate snapshot stale", zap.Int64("age_ms", age), zap.Int32("max_age_ms", req.GetMaxAgeMs()), zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", provider))
+			s.logger.Warn("Rate snapshot stale", zap.Int64("age_ms", age), zap.Int32("max_age_ms", req.GetMaxAgeMs()), zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", provider))
 			return gsresponse.FailedPrecondition[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, "stale_rate", merrors.InvalidArgument("rate older than allowed window"))
 		}
 	}
 
 	comp, err := newQuoteComputation(pair, rate, req.GetSide(), provider)
 	if err != nil {
-		logger.Warn("GetQuote invalid input", zap.Error(err))
 		return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 	}
 
 	if req.GetBaseAmount() != nil {
 		if err := comp.withBaseInput(req.GetBaseAmount()); err != nil {
-			logger.Warn("GetQuote invalid base input", zap.Error(err))
 			return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	} else if req.GetQuoteAmount() != nil {
 		if err := comp.withQuoteInput(req.GetQuoteAmount()); err != nil {
-			logger.Warn("GetQuote invalid quote input", zap.Error(err))
 			return gsresponse.InvalidArgument[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
 
 	if err := comp.compute(); err != nil {
-		logger.Warn("GetQuote computation failed", zap.Error(err))
 		return gsresponse.Internal[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 	}
 
@@ -208,14 +195,12 @@ func (s *Service) getQuoteResponder(ctx context.Context, req *oraclev1.GetQuoteR
 		if err := s.storage.Quotes().Issue(ctx, quoteModel); err != nil {
 			switch {
 			case errors.Is(err, merrors.ErrDataConflict):
-				logger.Warn("GetQuote conflict issuing firm quote", zap.Error(err), zap.String("quote_ref", quoteModel.QuoteRef))
 				return gsresponse.Conflict[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 			default:
-				logger.Warn("GetQuote failed to issue firm quote", zap.Error(err), zap.String("quote_ref", quoteModel.QuoteRef))
 				return gsresponse.Internal[oraclev1.GetQuoteResponse](s.logger, mservice.FXOracle, err)
 			}
 		}
-		logger.Info("Firm quote stored", zap.String("quote_ref", quoteModel.QuoteRef), zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", quoteModel.Provider), zap.Int64("expires_at_ms", quoteModel.ExpiresAtUnixMs))
+		s.logger.Info("Firm quote stored", zap.String("quote_ref", quoteModel.QuoteRef), zap.String("pair", pairKey.Base+"/"+pairKey.Quote), zap.String("provider", quoteModel.Provider), zap.Int64("expires_at_ms", quoteModel.ExpiresAtUnixMs))
 	}
 
 	resp := &oraclev1.GetQuoteResponse{
@@ -229,24 +214,18 @@ func (s *Service) validateQuoteResponder(ctx context.Context, req *oraclev1.Vali
 	if req == nil {
 		req = &oraclev1.ValidateQuoteRequest{}
 	}
-	logger := s.logger.With(requestMetaFields(req.GetMeta())...)
-	if ref := strings.TrimSpace(req.GetQuoteRef()); ref != "" {
-		logger = logger.With(zap.String("quote_ref", ref))
-	}
-	logger.Debug("Handling ValidateQuote")
+	s.logger.Debug("Handling ValidateQuote", zap.String("quote_ref", req.GetQuoteRef()))
 	if req.GetQuoteRef() == "" {
-		logger.Warn("ValidateQuote invalid: quote_ref missing")
 		return gsresponse.InvalidArgument[oraclev1.ValidateQuoteResponse](s.logger, mservice.FXOracle, errQuoteRefRequired)
 	}
 	if err := s.pingStorage(ctx); err != nil {
-		logger.Warn("Storage unavailable during ValidateQuote", zap.Error(err))
+		s.logger.Warn("Storage unavailable during ValidateQuote", zap.Error(err))
 		return gsresponse.Unavailable[oraclev1.ValidateQuoteResponse](s.logger, mservice.FXOracle, err)
 	}
 	quote, err := s.storage.Quotes().GetByRef(ctx, req.GetQuoteRef())
 	if err != nil {
 		switch {
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("ValidateQuote: quote not found", zap.String("quote_ref", req.GetQuoteRef()))
 			resp := &oraclev1.ValidateQuoteResponse{
 				Meta:   buildResponseMeta(req.GetMeta()),
 				Quote:  nil,
@@ -255,7 +234,6 @@ func (s *Service) validateQuoteResponder(ctx context.Context, req *oraclev1.Vali
 			}
 			return gsresponse.Success(resp)
 		default:
-			logger.Warn("ValidateQuote failed", zap.Error(err))
 			return gsresponse.Internal[oraclev1.ValidateQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -277,11 +255,6 @@ func (s *Service) validateQuoteResponder(ctx context.Context, req *oraclev1.Vali
 		Valid:  valid,
 		Reason: reason,
 	}
-	if !valid {
-		logger.Info("ValidateQuote invalid", zap.String("reason", reason), zap.Bool("firm", quote.Firm))
-	} else {
-		logger.Debug("ValidateQuote valid", zap.Bool("firm", quote.Firm))
-	}
 	return gsresponse.Success(resp)
 }
 
@@ -289,43 +262,29 @@ func (s *Service) consumeQuoteResponder(ctx context.Context, req *oraclev1.Consu
 	if req == nil {
 		req = &oraclev1.ConsumeQuoteRequest{}
 	}
-	logger := s.logger.With(requestMetaFields(req.GetMeta())...)
-	if ref := strings.TrimSpace(req.GetQuoteRef()); ref != "" {
-		logger = logger.With(zap.String("quote_ref", ref))
-	}
-	if ledger := strings.TrimSpace(req.GetLedgerTxnRef()); ledger != "" {
-		logger = logger.With(zap.String("ledger_txn_ref", ledger))
-	}
-	logger.Debug("Handling ConsumeQuote")
+	s.logger.Debug("Handling ConsumeQuote", zap.String("quote_ref", req.GetQuoteRef()), zap.String("ledger_txn_ref", req.GetLedgerTxnRef()))
 	if req.GetQuoteRef() == "" {
-		logger.Warn("ConsumeQuote invalid: quote_ref missing")
 		return gsresponse.InvalidArgument[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, errQuoteRefRequired)
 	}
 	if req.GetLedgerTxnRef() == "" {
-		logger.Warn("ConsumeQuote invalid: ledger_txn_ref missing")
 		return gsresponse.InvalidArgument[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, errLedgerTxnRefRequired)
 	}
 	if err := s.pingStorage(ctx); err != nil {
-		logger.Warn("Storage unavailable during ConsumeQuote", zap.Error(err))
+		s.logger.Warn("Storage unavailable during ConsumeQuote", zap.Error(err))
 		return gsresponse.Unavailable[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, err)
 	}
 	_, err := s.storage.Quotes().Consume(ctx, req.GetQuoteRef(), req.GetLedgerTxnRef(), time.Now())
 	if err != nil {
 		switch {
 		case errors.Is(err, storage.ErrQuoteExpired):
-			logger.Warn("ConsumeQuote failed: expired")
 			return gsresponse.FailedPrecondition[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, "expired", err)
 		case errors.Is(err, storage.ErrQuoteConsumed):
-			logger.Warn("ConsumeQuote failed: already consumed")
 			return gsresponse.FailedPrecondition[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, "consumed", err)
 		case errors.Is(err, storage.ErrQuoteNotFirm):
-			logger.Warn("ConsumeQuote failed: quote not firm")
 			return gsresponse.FailedPrecondition[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, "not_firm", err)
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("ConsumeQuote failed: quote not found")
 			return gsresponse.NotFound[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, err)
 		default:
-			logger.Warn("ConsumeQuote failed", zap.Error(err))
 			return gsresponse.Internal[oraclev1.ConsumeQuoteResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -335,7 +294,7 @@ func (s *Service) consumeQuoteResponder(ctx context.Context, req *oraclev1.Consu
 		Consumed: true,
 		Reason:   "consumed",
 	}
-	logger.Info("Quote consumed")
+	s.logger.Debug("Quote consumed", zap.String("quote_ref", req.GetQuoteRef()), zap.String("ledger_txn_ref", req.GetLedgerTxnRef()))
 	return gsresponse.Success(resp)
 }
 
@@ -343,21 +302,13 @@ func (s *Service) latestRateResponder(ctx context.Context, req *oraclev1.LatestR
 	if req == nil {
 		req = &oraclev1.LatestRateRequest{}
 	}
-	logger := s.logger.With(requestMetaFields(req.GetMeta())...)
-	if pair := req.GetPair(); pair != nil {
-		logger = logger.With(zap.String("pair_base", strings.TrimSpace(pair.GetBase())), zap.String("pair_quote", strings.TrimSpace(pair.GetQuote())))
-	}
-	if provider := strings.TrimSpace(req.GetProvider()); provider != "" {
-		logger = logger.With(zap.String("provider", provider))
-	}
-	logger.Debug("Handling LatestRate")
+	s.logger.Debug("Handling LatestRate", zap.String("pair", req.GetPair().GetBase()+"/"+req.GetPair().GetQuote()))
 	if err := s.pingStorage(ctx); err != nil {
-		logger.Warn("Storage unavailable during LatestRate", zap.Error(err))
+		s.logger.Warn("Storage unavailable during LatestRate", zap.Error(err))
 		return gsresponse.Unavailable[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, err)
 	}
 	pairMsg := req.GetPair()
 	if pairMsg == nil || strings.TrimSpace(pairMsg.GetBase()) == "" || strings.TrimSpace(pairMsg.GetQuote()) == "" {
-		logger.Warn("LatestRate invalid: pair missing")
 		return gsresponse.InvalidArgument[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, errEmptyRequest)
 	}
 	pair := model.CurrencyPair{Base: strings.ToUpper(pairMsg.GetBase()), Quote: strings.ToUpper(pairMsg.GetQuote())}
@@ -366,10 +317,8 @@ func (s *Service) latestRateResponder(ctx context.Context, req *oraclev1.LatestR
 	if err != nil {
 		switch {
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("LatestRate pair not found")
 			return gsresponse.NotFound[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, err)
 		default:
-			logger.Warn("LatestRate failed to load pair", zap.Error(err))
 			return gsresponse.Internal[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -386,10 +335,8 @@ func (s *Service) latestRateResponder(ctx context.Context, req *oraclev1.LatestR
 	if err != nil {
 		switch {
 		case errors.Is(err, merrors.ErrNoData):
-			logger.Warn("LatestRate not found", zap.String("provider", provider))
 			return gsresponse.NotFound[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, err)
 		default:
-			logger.Warn("LatestRate failed", zap.Error(err))
 			return gsresponse.Internal[oraclev1.LatestRateResponse](s.logger, mservice.FXOracle, err)
 		}
 	}
@@ -398,7 +345,6 @@ func (s *Service) latestRateResponder(ctx context.Context, req *oraclev1.LatestR
 		Meta: buildResponseMeta(req.GetMeta()),
 		Rate: rateModelToProto(rate),
 	}
-	logger.Debug("LatestRate succeeded", zap.String("provider", provider), zap.Int64("asof_unix_ms", rate.AsOfUnixMs))
 	return gsresponse.Success(resp)
 }
 
@@ -406,15 +352,13 @@ func (s *Service) listPairsResponder(ctx context.Context, req *oraclev1.ListPair
 	if req == nil {
 		req = &oraclev1.ListPairsRequest{}
 	}
-	logger := s.logger.With(requestMetaFields(req.GetMeta())...)
-	logger.Debug("Handling ListPairs")
+	s.logger.Debug("Handling ListPairs")
 	if err := s.pingStorage(ctx); err != nil {
-		logger.Warn("Storage unavailable during ListPairs", zap.Error(err))
+		s.logger.Warn("Storage unavailable during ListPairs", zap.Error(err))
 		return gsresponse.Unavailable[oraclev1.ListPairsResponse](s.logger, mservice.FXOracle, err)
 	}
 	pairs, err := s.storage.Pairs().ListEnabled(ctx)
 	if err != nil {
-		logger.Warn("ListPairs failed", zap.Error(err))
 		return gsresponse.Internal[oraclev1.ListPairsResponse](s.logger, mservice.FXOracle, err)
 	}
 	result := make([]*oraclev1.PairMeta, 0, len(pairs))
@@ -425,7 +369,7 @@ func (s *Service) listPairsResponder(ctx context.Context, req *oraclev1.ListPair
 		Meta:  buildResponseMeta(req.GetMeta()),
 		Pairs: result,
 	}
-	logger.Debug("ListPairs returning metadata", zap.Int("pairs", len(resp.GetPairs())))
+	s.logger.Debug("ListPairs returning metadata", zap.Int("pairs", len(resp.GetPairs())))
 	return gsresponse.Success(resp)
 }
 

api/payments/orchestrator/config.yml

@@ -61,6 +61,3 @@ card_gateways:
   monetix:
     funding_address: "wallet_funding_monetix"
     fee_address: "wallet_fee_monetix"
-
-fee_ledger_accounts:
-  monetix: "ledger:fees:monetix"

api/payments/orchestrator/internal/server/internal/serverimp.go

@@ -46,7 +46,6 @@ type config struct {
 	Gateway         clientConfig                      `yaml:"gateway"`
 	Oracle          clientConfig                      `yaml:"oracle"`
 	CardGateways    map[string]cardGatewayRouteConfig `yaml:"card_gateways"`
-	FeeAccounts     map[string]string                 `yaml:"fee_ledger_accounts"`
 }
 
 type clientConfig struct {
@@ -160,9 +159,6 @@ func (i *Imp) Start() error {
 		if routes := buildCardGatewayRoutes(cfg.CardGateways); len(routes) > 0 {
 			opts = append(opts, orchestrator.WithCardGatewayRoutes(routes))
 		}
-		if feeAccounts := buildFeeLedgerAccounts(cfg.FeeAccounts); len(feeAccounts) > 0 {
-			opts = append(opts, orchestrator.WithFeeLedgerAccounts(feeAccounts))
-		}
 		return orchestrator.NewService(logger, repo, opts...), nil
 	}
 
@@ -327,19 +323,3 @@ func buildCardGatewayRoutes(src map[string]cardGatewayRouteConfig) map[string]or
 	}
 	return result
 }
-
-func buildFeeLedgerAccounts(src map[string]string) map[string]string {
-	if len(src) == 0 {
-		return nil
-	}
-	result := make(map[string]string, len(src))
-	for key, account := range src {
-		k := strings.ToLower(strings.TrimSpace(key))
-		v := strings.TrimSpace(account)
-		if k == "" || v == "" {
-			continue
-		}
-		result[k] = v
-	}
-	return result
-}

api/payments/orchestrator/internal/service/orchestrator/helpers.go

@@ -383,22 +383,6 @@ func feeBreakdownFromQuote(quote *orchestratorv1.PaymentQuote) []*chainv1.Servic
 	return breakdown
 }
 
-func assignLedgerAccounts(lines []*feesv1.DerivedPostingLine, account string) []*feesv1.DerivedPostingLine {
-	if account == "" || len(lines) == 0 {
-		return lines
-	}
-	for _, line := range lines {
-		if line == nil {
-			continue
-		}
-		if strings.TrimSpace(line.GetLedgerAccountRef()) != "" {
-			continue
-		}
-		line.LedgerAccountRef = account
-	}
-	return lines
-}
-
 func moneyEquals(a, b *moneyv1.Money) bool {
 	if a == nil || b == nil {
 		return false

api/payments/orchestrator/internal/service/orchestrator/options.go

@@ -113,24 +113,6 @@ func WithCardGatewayRoutes(routes map[string]CardGatewayRoute) Option {
 	}
 }
 
-// WithFeeLedgerAccounts maps gateway identifiers to ledger accounts used for fees.
-func WithFeeLedgerAccounts(routes map[string]string) Option {
-	return func(s *Service) {
-		if len(routes) == 0 {
-			return
-		}
-		s.deps.feeLedgerAccounts = make(map[string]string, len(routes))
-		for k, v := range routes {
-			key := strings.ToLower(strings.TrimSpace(k))
-			val := strings.TrimSpace(v)
-			if key == "" || val == "" {
-				continue
-			}
-			s.deps.feeLedgerAccounts[key] = val
-		}
-	}
-}
-
 // WithClock overrides the default clock.
 func WithClock(clock clockpkg.Clock) Option {
 	return func(s *Service) {

api/payments/orchestrator/internal/service/orchestrator/quote_engine.go

@@ -52,9 +52,7 @@ func (s *Service) buildPaymentQuote(ctx context.Context, orgRef string, req *orc
 	} else if amount != nil {
 		feeCurrency = amount.GetCurrency()
 	}
-	feeLines := cloneFeeLines(feeQuote.GetLines())
-	s.assignFeeLedgerAccounts(intent, feeLines)
-	feeTotal := extractFeeTotal(feeLines, feeCurrency)
+	feeTotal := extractFeeTotal(feeQuote.GetLines(), feeCurrency)
 
 	var networkFee *chainv1.EstimateTransferFeeResponse
 	if shouldEstimateNetworkFee(intent) {
@@ -71,7 +69,7 @@ func (s *Service) buildPaymentQuote(ctx context.Context, orgRef string, req *orc
 		DebitAmount:              debitAmount,
 		ExpectedSettlementAmount: settlementAmount,
 		ExpectedFeeTotal:         feeTotal,
-		FeeLines:                 feeLines,
+		FeeLines:                 cloneFeeLines(feeQuote.GetLines()),
 		FeeRules:                 cloneFeeRules(feeQuote.GetApplied()),
 		FxQuote:                  fxQuote,
 		NetworkFee:               networkFee,
@@ -209,53 +207,3 @@ func (s *Service) requestFXQuote(ctx context.Context, orgRef string, req *orches
 	}
 	return quoteToProto(quote), nil
 }
-
-func (s *Service) feeLedgerAccountForIntent(intent *orchestratorv1.PaymentIntent) string {
-	if intent == nil || len(s.deps.feeLedgerAccounts) == 0 {
-		return ""
-	}
-
-	key := s.gatewayKeyFromIntent(intent)
-	if key == "" {
-		return ""
-	}
-	return strings.TrimSpace(s.deps.feeLedgerAccounts[key])
-}
-
-func (s *Service) assignFeeLedgerAccounts(intent *orchestratorv1.PaymentIntent, lines []*feesv1.DerivedPostingLine) {
-	account := s.feeLedgerAccountForIntent(intent)
-	key := s.gatewayKeyFromIntent(intent)
-
-	missing := 0
-	for _, line := range lines {
-		if line == nil {
-			continue
-		}
-		if strings.TrimSpace(line.GetLedgerAccountRef()) == "" {
-			missing++
-		}
-	}
-	if missing == 0 {
-		return
-	}
-
-	if account == "" {
-		s.logger.Debug("no fee ledger account mapping found", zap.String("gateway", key), zap.Int("missing_lines", missing))
-		return
-	}
-	assignLedgerAccounts(lines, account)
-	s.logger.Debug("applied fee ledger account mapping", zap.String("gateway", key), zap.String("ledger_account", account), zap.Int("lines", missing))
-}
-
-func (s *Service) gatewayKeyFromIntent(intent *orchestratorv1.PaymentIntent) string {
-	if intent == nil {
-		return ""
-	}
-	key := strings.TrimSpace(intent.GetAttributes()["gateway"])
-	if key == "" {
-		if dest := intent.GetDestination(); dest != nil && dest.GetCard() != nil {
-			key = defaultCardGateway
-		}
-	}
-	return strings.ToLower(key)
-}

api/payments/orchestrator/internal/service/orchestrator/service.go

@@ -47,7 +47,6 @@ type serviceDependencies struct {
 	oracle     oracleDependency
 	mntx       mntxDependency
 	cardRoutes map[string]CardGatewayRoute
-	feeLedgerAccounts map[string]string
 }
 
 type handlerSet struct {

api/server/config.yml

@@ -90,8 +90,8 @@ api:
     call_timeout_seconds: 5
     insecure: true
   payment_orchestrator:
-    address: sendico_payments_orchestrator:50062
-    address_env: PAYMENTS_ADDRESS
+    address: sendico_payment_orchestrator:50062
+    address_env: PAYMENT_ORCHESTRATOR_ADDRESS
     dial_timeout_seconds: 5
     call_timeout_seconds: 5
     insecure: true

api/server/interface/api/srequest/payment_intent.go

@@ -15,12 +15,6 @@ type PaymentIntent struct {
 	Attributes     map[string]string `json:"attributes,omitempty"`
 }
 
-type AssetResolverStub struct{}
-
-func (a *AssetResolverStub) IsSupported(_ string) bool {
-	return true
-}
-
 func (p *PaymentIntent) Validate() error {
 	// Kind must be set (non-zero)
 	var zeroKind PaymentKind
@@ -39,8 +33,7 @@ func (p *PaymentIntent) Validate() error {
 	if p.Amount == nil {
 		return merrors.InvalidArgument("amount is required", "intent.amount")
 	}
-	//TODO: collect supported currencies and validate against them
-	if err := ValidateMoney(p.Amount, &AssetResolverStub{}); err != nil {
+	if err := ValidateMoney(p.Amount); err != nil {
 		return err
 	}
 

api/server/interface/api/srequest/payment_value_objects.go

@@ -1,77 +1,30 @@
 package srequest
 
 import (
-	"regexp"
-	"strings"
-
 	"github.com/shopspring/decimal"
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/model"
 )
 
-// AssetResolver defines environment-specific supported assets.
-// Implementations should check:
-// - fiat assets (ISO-4217)
-// - crypto assets supported by gateways / FX providers
-type AssetResolver interface {
-	IsSupported(ticker string) bool
+func ValidateMoney(m *model.Money) error {
+	if m.Amount == "" {
+		return merrors.InvalidArgument("amount is required", "intent.amount")
 	}
-
-// Precompile regex for efficiency.
-var currencySyntax = regexp.MustCompile(`^[A-Z0-9]{2,10}$`)
-
-// ValidateCurrency validates currency syntax and checks dictionary via assetResolver.
-func ValidateCurrency(cur string, assetResolver AssetResolver) error {
-	// Basic presence
-	if strings.TrimSpace(cur) == "" {
+	if m.Currency == "" {
 		return merrors.InvalidArgument("currency is required", "intent.currency")
 	}
 
-	// Normalize
-	cur = strings.ToUpper(strings.TrimSpace(cur))
-
-	// Syntax check
-	if !currencySyntax.MatchString(cur) {
-		return merrors.InvalidArgument(
-			"invalid currency format (must be A–Z0–9, length 2–10)",
-			"intent.currency",
-		)
+	if _, err := decimal.NewFromString(m.Amount); err != nil {
+		return merrors.InvalidArgument("invalid amount decimal", "intent.amount")
 	}
 
-	// Dictionary validation
-	if assetResolver == nil {
-		return merrors.InvalidArgument("asset resolver is not configured", "intent.currency")
+	if len(m.Currency) != 3 {
+		return merrors.InvalidArgument("currency must be 3 letters", "intent.currency")
 	}
-
-	if !assetResolver.IsSupported(cur) {
-		return merrors.InvalidArgument("unsupported currency/asset", "intent.currency")
+	for _, c := range m.Currency {
+		if c < 'A' || c > 'Z' {
+			return merrors.InvalidArgument("currency must be uppercase A-Z", "intent.currency")
 		}
-
-	return nil
-}
-
-func ValidateMoney(m *model.Money, assetResolver AssetResolver) error {
-	if m == nil {
-		return merrors.InvalidArgument("money is required", "intent.amount")
-	}
-
-	// 1) Basic presence
-	if strings.TrimSpace(m.Amount) == "" {
-		return merrors.InvalidArgument("amount is required", "intent.amount")
-	}
-
-	// 2) Validate decimal amount
-	amount, err := decimal.NewFromString(m.Amount)
-	if err != nil {
-		return merrors.InvalidArgument("invalid decimal amount", "intent.amount")
-	}
-	if amount.IsNegative() {
-		return merrors.InvalidArgument("amount must be >= 0", "intent.amount")
-	}
-
-	// 3) Validate currency via helper
-	if err := ValidateCurrency(m.Currency, assetResolver); err != nil {
-		return err
 	}
 
 	return nil
@@ -83,15 +36,31 @@ type CurrencyPair struct {
 }
 
 func (p *CurrencyPair) Validate() error {
-	if p == nil {
-		return merrors.InvalidArgument("currency pair is required", "currncy_pair")
+	if p.Base == "" {
+		return merrors.InvalidArgument("base currency is required", "intent.fx.pair.base")
 	}
-	if err := ValidateCurrency(p.Base, &AssetResolverStub{}); err != nil {
-		return merrors.InvalidArgument("invalid base currency in pair: "+err.Error(), "currency_pair.base")
+	if p.Quote == "" {
+		return merrors.InvalidArgument("quote currency is required", "intent.fx.pair.quote")
 	}
-	if err := ValidateCurrency(p.Quote, &AssetResolverStub{}); err != nil {
-		return merrors.InvalidArgument("invalid quote currency in pair: "+err.Error(), "currency_pair.quote")
+
+	if len(p.Base) != 3 {
+		return merrors.InvalidArgument("base currency must be 3 letters", "intent.fx.pair.base")
 	}
+	if len(p.Quote) != 3 {
+		return merrors.InvalidArgument("quote currency must be 3 letters", "intent.fx.pair.quote")
+	}
+
+	for _, c := range p.Base {
+		if c < 'A' || c > 'Z' {
+			return merrors.InvalidArgument("base currency must be uppercase A-Z", "intent.fx.pair.base")
+		}
+	}
+	for _, c := range p.Quote {
+		if c < 'A' || c > 'Z' {
+			return merrors.InvalidArgument("quote currency must be uppercase A-Z", "intent.fx.pair.quote")
+		}
+	}
+
 	return nil
 }
 

ci/prod/compose/bff.yml

@@ -31,7 +31,6 @@ services:
       NATS_PASSWORD: ${NATS_PASSWORD}
       CHAIN_GATEWAY_ADDRESS: ${CHAIN_GATEWAY_SERVICE_NAME}:${CHAIN_GATEWAY_GRPC_PORT}
       LEDGER_ADDRESS: ${LEDGER_SERVICE_NAME}:${LEDGER_GRPC_PORT}
-      PAYMENTS_ADDRESS: ${PAYMENTS_SERVICE_NAME}:${PAYMENTS_GRPC_PORT}
       MONGO_HOST: ${MONGO_HOST}
       MONGO_PORT: ${MONGO_PORT}
       MONGO_DATABASE: ${MONGO_DATABASE}

frontend/pshared/lib/config/common.dart

@@ -11,6 +11,8 @@ class CommonConstants {
   static String apiEndpoint = '/api/v1';
   static String amplitudeSecret = 'c3d75b3e2520d708440acbb16b923e79';
   static String amplitudeServerZone = 'EU';
+  static String posthogApiKey = '';
+  static String posthogHost = 'https://eu.i.posthog.com';
   static Locale defaultLocale = const Locale('en');
   static String defaultCurrency = 'EUR';
   static int defaultDimensionLength = 500;
@@ -36,6 +38,8 @@ class CommonConstants {
     apiEndpoint = configJson['apiEndpoint'] ?? apiEndpoint;
     amplitudeSecret = configJson['amplitudeSecret'] ?? amplitudeSecret;
     amplitudeServerZone = configJson['amplitudeServerZone'] ?? amplitudeServerZone;
+    posthogApiKey = configJson['posthogApiKey'] ?? posthogApiKey;
+    posthogHost = configJson['posthogHost'] ?? posthogHost;
     defaultLocale = Locale(configJson['defaultLocale'] ?? defaultLocale.languageCode);
     defaultCurrency = configJson['defaultCurrency'] ?? defaultCurrency;
     wsProto = configJson['wsProto'] ?? wsProto;

frontend/pshared/lib/config/mobile.dart

@@ -15,6 +15,8 @@ class Constants extends CommonConstants {
   static String get currentOrgKey => CommonConstants.currentOrgKey;
   static String get apiUrl => CommonConstants.apiUrl;
   static String get serviceUrl => CommonConstants.serviceUrl;
+  static String get posthogApiKey => CommonConstants.posthogApiKey;
+  static String get posthogHost => CommonConstants.posthogHost;
   static int get defaultDimensionLength => CommonConstants.defaultDimensionLength;
   static String get deviceIdStorageKey => CommonConstants.deviceIdStorageKey;
   static String get nilObjectRef => CommonConstants.nilObjectRef;

frontend/pshared/lib/config/web.dart

@@ -21,6 +21,8 @@ extension AppConfigExtension on AppConfig {
   external String? get apiEndpoint;
   external String? get amplitudeSecret;
   external String? get amplitudeServerZone;
+  external String? get posthogApiKey;
+  external String? get posthogHost;
   external String? get defaultLocale;
   external String? get wsProto;
   external String? get wsEndpoint;
@@ -40,6 +42,8 @@ class Constants extends CommonConstants {
   static String get currentOrgKey => CommonConstants.currentOrgKey;
   static String get apiUrl => CommonConstants.apiUrl;
   static String get serviceUrl => CommonConstants.serviceUrl;
+  static String get posthogApiKey => CommonConstants.posthogApiKey;
+  static String get posthogHost => CommonConstants.posthogHost;
   static int get defaultDimensionLength => CommonConstants.defaultDimensionLength;
   static String get deviceIdStorageKey => CommonConstants.deviceIdStorageKey;
   static String get nilObjectRef => CommonConstants.nilObjectRef;
@@ -57,6 +61,8 @@ class Constants extends CommonConstants {
         'apiEndpoint': config.apiEndpoint,
         'amplitudeSecret': config.amplitudeSecret,
         'amplitudeServerZone': config.amplitudeServerZone,
+        'posthogApiKey': config.posthogApiKey,
+        'posthogHost': config.posthogHost,
         'defaultLocale': config.defaultLocale,
         'wsProto': config.wsProto,
         'wsEndpoint': config.wsEndpoint,

frontend/pshared/lib/models/resources.dart

@@ -79,12 +79,13 @@ enum ResourceType {
   @JsonValue('payments')
   payments,
 
-  @JsonValue('payment_methods')
-  paymentMethods,
-
+  /// Represents payment orchestration service
   @JsonValue('payment_orchestrator')
   paymentOrchestrator,
 
+  @JsonValue('payment_methods')
+  paymentMethods,
+
   /// Represents permissions service
   @JsonValue('permissions')
   permissions,

frontend/pshared/lib/provider/account.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 
 import 'package:share_plus/share_plus.dart';
@@ -20,6 +22,9 @@ import 'package:pshared/utils/exception.dart';
 
 
 class AccountProvider extends ChangeNotifier {
+  AccountProvider({Future<void> Function(Account?)? onAccountChanged})
+      : _onAccountChanged = onAccountChanged;
+
   static String get currentUserRef => Constants.nilObjectRef;
 
   // The resource now wraps our Account? state along with its loading/error state.
@@ -27,6 +32,8 @@ class AccountProvider extends ChangeNotifier {
   Resource<Account?> get resource => _resource;
   late LocaleProvider _localeProvider;
   PendingLogin? _pendingLogin;
+  Future<void>? _restoreFuture;
+  Future<void> Function(Account?)? _onAccountChanged;
 
   Account? get account => _resource.data;
   PendingLogin? get pendingLogin => _pendingLogin;
@@ -53,11 +60,21 @@ class AccountProvider extends ChangeNotifier {
   }
 
   // Private helper to update the resource and notify listeners.
+  void setAccountChangedListener(Future<void> Function(Account?)? listener) => _onAccountChanged = listener;
+
   void _setResource(Resource<Account?> newResource) {
+    final previousAccount = _resource.data;
     _resource = newResource;
+    _notifyAccountChanged(previousAccount, newResource.data);
     notifyListeners();
   }
 
+  void _notifyAccountChanged(Account? previous, Account? current) {
+    if (previous == current) return;
+    final handler = _onAccountChanged;
+    if (handler != null) unawaited(handler(current));
+  }
+
   void updateProvider(LocaleProvider localeProvider) => _localeProvider = localeProvider; 
 
   void _pickupLocale(String locale) => _localeProvider.setLocale(Locale(locale));
@@ -220,4 +237,11 @@ class AccountProvider extends ChangeNotifier {
       rethrow;
     }
   }
+
+  Future<void> restoreIfPossible() {
+    return _restoreFuture ??= AuthorizationService.isAuthorizationStored().then<void>((hasAuth) async {
+      if (!hasAuth) return;
+      await restore();
+    });
+  }
 }

frontend/pshared/lib/provider/permissions.dart

@@ -21,6 +21,7 @@ class PermissionsProvider extends ChangeNotifier {
   Resource<UserAccess> _userAccess = Resource(data: null, isLoading: false, error: null);
   late OrganizationsProvider _organizations;
   bool _isLoaded = false;
+  bool _errorHandled = false;
 
   void update(OrganizationsProvider venue) {
     _organizations = venue;
@@ -44,6 +45,7 @@ class PermissionsProvider extends ChangeNotifier {
   /// Load the [UserAccess] for the current venue.
   Future<UserAccess?> load() async {
     _userAccess = _userAccess.copyWith(isLoading: true, error: null);
+    _errorHandled = false;
     notifyListeners();
 
     try {
@@ -67,6 +69,12 @@ class PermissionsProvider extends ChangeNotifier {
     return _userAccess.data;
   }
 
+  bool get hasUnhandledError => error != null && !_errorHandled;
+
+  void markErrorHandled() {
+    _errorHandled = true;
+  }
+
   Future<UserAccess?> changeRole(String accountRef, String newRoleDescRef) async {
     final currentRole = roles.firstWhereOrNull((r) => r.accountRef == accountRef);
     final currentDesc = currentRole != null

frontend/pweb/lib/main.dart

@@ -27,6 +27,7 @@ import 'package:pweb/providers/wallets.dart';
 import 'package:pweb/providers/wallet_transactions.dart';
 import 'package:pweb/services/operations.dart';
 import 'package:pweb/services/payments/history.dart';
+import 'package:pweb/services/posthog.dart';
 import 'package:pweb/services/wallet_transactions.dart';
 import 'package:pweb/services/wallets.dart';
 
@@ -40,11 +41,9 @@ void _setupLogging() {
 }
 
 void main() async {
-  await Constants.initialize();
-
   WidgetsFlutterBinding.ensureInitialized();
-
-  // await AmplitudeService.initialize();
+  await Constants.initialize();
+  await PosthogService.initialize();
 
 
   _setupLogging();
@@ -57,7 +56,12 @@ void main() async {
       providers: [
         ChangeNotifierProvider(create: (_) => LocaleProvider(null)),
         ChangeNotifierProxyProvider<LocaleProvider, AccountProvider>(
-          create: (_) => AccountProvider(),
+          create: (_) => AccountProvider(
+            onAccountChanged: (account) {
+              if (account == null) return Future<void>.value();
+              return PosthogService.identify(account);
+            },
+          ),
           update: (context, localeProvider, provider) => provider!..updateProvider(localeProvider),
         ),
         ChangeNotifierProxyProvider<AccountProvider, TwoFactorProvider>(
@@ -70,6 +74,7 @@ void main() async {
           update: (context, orgnization, provider) => provider!..update(orgnization),
         ),
         ChangeNotifierProvider(create: (_) => CarouselIndexProvider()),
+
         ChangeNotifierProvider(
           create: (_) => UploadHistoryProvider(service: MockUploadHistoryService())..load(),
         ),
@@ -91,6 +96,7 @@ void main() async {
         ChangeNotifierProvider(
           create: (_) => MockPaymentProvider(),
         ),
+        
         ChangeNotifierProvider(
           create: (_) => OperationProvider(OperationService())..loadOperations(),
         ),

frontend/pweb/lib/pages/address_book/form/page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 
 import 'package:collection/collection.dart';
@@ -14,6 +16,7 @@ import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 
 import 'package:pweb/pages/address_book/form/view.dart';
+import 'package:pweb/services/posthog.dart';
 import 'package:pweb/utils/error/snackbar.dart';
 import 'package:pweb/utils/payment/label.dart';
 import 'package:pweb/utils/snackbar.dart';
@@ -106,11 +109,11 @@ class _AdressBookRecipientFormState extends State<AdressBookRecipientForm> {
       return;
     }
 
-    // AmplitudeService.recipientAddCompleted(
-    //   _type,
-    //   _status,
-    //   _methods.keys.toSet(),
-    // );
+    unawaited(PosthogService.recipientAddCompleted(
+      _type,
+      _status,
+      _methods.keys.toSet(),
+    ));
     final recipient = await executeActionWithNotification(
       context: context, 
       action: _doSave, 

frontend/pweb/lib/pages/loaders/account.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
 
 import 'package:provider/provider.dart';
 
@@ -10,26 +11,50 @@ import 'package:pweb/widgets/error/snackbar.dart';
 import 'package:pweb/generated/i18n/app_localizations.dart';
 
 
-class AccountLoader extends StatelessWidget {
+class AccountLoader extends StatefulWidget {
   final Widget child;
-
   const AccountLoader({super.key, required this.child});
 
   @override
-  Widget build(BuildContext context) => Consumer<AccountProvider>(builder: (context, provider, _) {
-    if (provider.isLoading) return const Center(child: CircularProgressIndicator());
+  State<AccountLoader> createState() => _AccountLoaderState();
+}
+
+class _AccountLoaderState extends State<AccountLoader> {
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final provider = Provider.of<AccountProvider>(context, listen: false);
+      if (provider.account == null) {
+        provider.restoreIfPossible().catchError((error, stack) {
+          Logger('Account restore failed: $error');
+        });
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<AccountProvider>(builder: (context, provider, _) {
+      if (provider.account != null) {
+        return widget.child;
+      }
+
       if (provider.error != null) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
           postNotifyUserOfErrorX(
             context: context,
             errorSituation: AppLocalizations.of(context)!.errorLogin,
             exception: provider.error!,
           );
           navigateAndReplace(context, Pages.login);
-    }
-    if (provider.account == null) {
-      WidgetsBinding.instance.addPostFrameCallback((_) => navigateAndReplace(context, Pages.login));
+        });
         return const Center(child: CircularProgressIndicator());
       }
-    return child;
+
+      if (provider.isLoading) return const Center(child: CircularProgressIndicator());
+      WidgetsBinding.instance.addPostFrameCallback((_) => navigateAndReplace(context, Pages.login));
+      return const Center(child: CircularProgressIndicator());
     });
   }
+}

frontend/pweb/lib/pages/loaders/permissions.dart

@@ -21,20 +21,29 @@ class PermissionsLoader extends StatelessWidget {
     if (provider.isLoading) {
       return const Center(child: CircularProgressIndicator());
     }
+
     if (provider.error != null) {
+      if (provider.hasUnhandledError) {
+        provider.markErrorHandled();
+        WidgetsBinding.instance.addPostFrameCallback((_) {
           postNotifyUserOfErrorX(
             context: context,
             errorSituation: AppLocalizations.of(context)!.errorLogin,
             exception: provider.error!,
           );
           navigateAndReplace(context, Pages.login);
+        });
       }
+      return const Center(child: CircularProgressIndicator());
+    }
+
     if (provider.error == null && !provider.isReady && accountProvider.account != null) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         provider.load();
       });
       return const Center(child: CircularProgressIndicator());
     }
+
     return child;
   });
 }

frontend/pweb/lib/pages/login/form.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
@@ -14,6 +16,7 @@ import 'package:pweb/widgets/password/password.dart';
 import 'package:pweb/widgets/username.dart';
 import 'package:pweb/widgets/vspacer.dart';
 import 'package:pweb/widgets/error/snackbar.dart';
+import 'package:pweb/services/posthog.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';
 
@@ -43,6 +46,7 @@ class _LoginFormState extends State<LoginForm> {
         password: _passwordController.text,
         locale: context.read<LocaleProvider>().locale.languageCode,
       );
+      unawaited(PosthogService.login(pending: outcome.isPending));
       if (outcome.isPending) {
         // TODO: fix context usage
         navigateAndReplace(context, Pages.sfactor);

frontend/pweb/lib/pages/payment_methods/page.dart

@@ -16,6 +16,7 @@ import 'package:pweb/providers/payment_flow.dart';
 import 'package:pweb/pages/payment_methods/payment_page/body.dart';
 import 'package:pweb/providers/wallets.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';
+import 'package:pweb/services/posthog.dart';
 
 
 class PaymentPage extends StatefulWidget {
@@ -109,7 +110,7 @@ class _PaymentPageState extends State<PaymentPage> {
 
   void _handleSendPayment() {
     // TODO: Handle Payment logic
-    // AmplitudeService.paymentInitiated();
+    PosthogService.paymentInitiated(method: _flowProvider.selectedType);
   }
 
   @override

frontend/pweb/lib/pages/settings/profile/account/locale.dart

@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
 
 import 'package:pshared/provider/locale.dart';
 
-// import 'package:pweb/services/amplitude.dart';
+import 'package:pweb/services/posthog.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';
 
@@ -58,7 +58,7 @@ class LocalePicker extends StatelessWidget {
                 onChanged: (locale) {
                   if (locale != null) {
                     localeProvider.setLocale(locale);
-                    // AmplitudeService.localeChanged(locale);
+                    PosthogService.localeChanged(locale);
                   }
                 },
                 decoration: const InputDecoration(

frontend/pweb/lib/services/posthog.dart

@@ -0,0 +1,136 @@
+import 'package:flutter/material.dart';
+
+import 'package:logging/logging.dart';
+
+import 'package:posthog_flutter/posthog_flutter.dart';
+
+import 'package:pshared/config/constants.dart';
+import 'package:pshared/models/account/account.dart';
+import 'package:pshared/models/payment/type.dart';
+import 'package:pshared/models/recipient/status.dart';
+import 'package:pshared/models/recipient/type.dart';
+
+import 'package:pweb/widgets/sidebar/destinations.dart';
+
+
+class PosthogService {
+  static final _logger = Logger('service.posthog');
+  static String? _identifiedUserId;
+  static bool _initialized = false;
+
+  static bool get isEnabled => _initialized;
+
+  static Future<void> initialize() async {
+    final apiKey = Constants.posthogApiKey;
+    if (apiKey.isEmpty) {
+      _logger.warning('PostHog API key is not configured, analytics disabled.');
+      return;
+    }
+
+    try {
+      final config = PostHogConfig(apiKey)
+        ..host = Constants.posthogHost
+        ..captureApplicationLifecycleEvents = true;
+      await Posthog().setup(config);
+      await Posthog().register('client_id', Constants.clientId);
+      _initialized = true;
+      _logger.info('PostHog initialized with host ${Constants.posthogHost}');
+    } catch (e, st) {
+      _initialized = false;
+      _logger.warning('Failed to initialize PostHog: $e', e, st);
+    }
+  }
+
+  static Future<void> identify(Account account) async {
+    if (!_initialized) return;
+    if (_identifiedUserId == account.id) return;
+
+    await Posthog().identify(
+      userId: account.id,
+      userProperties: {
+        'email': account.login,
+        'name': account.name,
+        'locale': account.locale,
+        'created_at': account.createdAt.toIso8601String(),
+      },
+    );
+    _identifiedUserId = account.id;
+  }
+
+  static Future<void> reset() async {
+    if (!_initialized) return;
+    _identifiedUserId = null;
+    await Posthog().reset();
+  }
+
+  static Future<void> login({required bool pending}) async {
+    if (!_initialized) return;
+    await _capture(
+      'login',
+      properties: {
+        'result': pending ? 'pending' : 'success',
+      },
+    );
+  }
+
+  static Future<void> pageOpened(PayoutDestination page, {String? path, String? uiSource}) async {
+    if (!_initialized) return;
+    return _capture(
+      'pageOpened',
+      properties: {
+        'page': page.name,
+        if (path != null) 'path': path,
+        if (uiSource != null) 'uiSource': uiSource,
+      },
+    );
+  }
+
+  static Future<void> localeChanged(Locale locale) async {
+    if (!_initialized) return;
+    return _capture(
+      'localeChanged',
+      properties: {'locale': locale.toLanguageTag()},
+    );
+  }
+
+  static Future<void> recipientAddCompleted(
+    RecipientType type,
+    RecipientStatus status,
+    Set<PaymentType> methods,
+  ) async {
+    if (!_initialized) return;
+    return _capture(
+      'recipientAddCompleted',
+      properties: {
+        'methods': methods.map((m) => m.name).toList(),
+        'type': type.name,
+        'status': status.name,
+      },
+    );
+  }
+
+  static Future<void> paymentInitiated({PaymentType? method}) async {
+    if (!_initialized) return;
+    return _capture(
+      'paymentInitiated',
+      properties: {
+        if (method != null) 'method': method.name,
+      },
+    );
+  }
+
+  static Future<void> _capture(
+    String eventName, {
+    Map<String, Object?>? properties,
+  }) async {
+    if (!_initialized) return;
+    final filtered = <String, Object>{};
+    if (properties != null) {
+      for (final entry in properties.entries) {
+        final value = entry.value;
+        if (value != null) filtered[entry.key] = value;
+      }
+    }
+    await Posthog().capture(eventName: eventName, properties: filtered.isEmpty ? null : filtered);
+  }
+}

frontend/pweb/lib/utils/logout.dart

@@ -6,10 +6,12 @@ import 'package:pshared/provider/account.dart';
 import 'package:pshared/provider/permissions.dart';
 
 import 'package:pweb/app/router/pages.dart';
+import 'package:pweb/services/posthog.dart';
 
 
 void logoutUtil(BuildContext context) {
   context.read<AccountProvider>().logout();
   context.read<PermissionsProvider>().reset();
+  PosthogService.reset();
   navigateAndReplace(context, Pages.login);
 }

frontend/pweb/lib/widgets/sidebar/side_menu.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-// import 'package:pweb/services/amplitude.dart';
+import 'package:pweb/services/posthog.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';
 
 
@@ -49,7 +49,7 @@ class SideMenuColumn extends StatelessWidget {
                 child: InkWell(
                   onTap: () {
                     onSelected(item);
-                    // AmplitudeService.pageOpened(item, uiSource: 'sidebar');
+                    PosthogService.pageOpened(item, uiSource: 'sidebar');
                   },
                   borderRadius: BorderRadius.circular(12),
                   hoverColor: theme.colorScheme.primaryContainer,

frontend/pweb/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -9,6 +9,7 @@ import amplitude_flutter
 import file_selector_macos
 import flutter_timezone
 import path_provider_foundation
+import posthog_flutter
 import share_plus
 import shared_preferences_foundation
 import sqflite_darwin
@@ -19,6 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FlutterTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterTimezonePlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  PosthogFlutterPlugin.register(with: registry.registrar(forPlugin: "PosthogFlutterPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))

frontend/pweb/pubspec.yaml

@@ -35,6 +35,7 @@ dependencies:
     sdk: flutter
   pshared: 
     path: ../pshared
+  posthog_flutter: ^5.9.0
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.