Updated Settings Page

Merge pull request 'server endpoint' (#115 ) from quotes-115 into main
Reviewed-on: #115
2025-12-18 15:15:33 +03:00 · 2025-12-17 17:15:40 +00:00 · 2025-12-17 18:15:02 +01:00
27 changed files with 1042 additions and 118 deletions
--- a/api/payments/orchestrator/client/client.go
+++ b/api/payments/orchestrator/client/client.go
@@ -18,6 +18,7 @@ import (
 type Client interface {
 	QuotePayment(ctx context.Context, req *orchestratorv1.QuotePaymentRequest) (*orchestratorv1.QuotePaymentResponse, error)
 	QuotePayments(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) (*orchestratorv1.QuotePaymentsResponse, error)
+	InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error)
 	InitiatePayment(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error)
 	CancelPayment(ctx context.Context, req *orchestratorv1.CancelPaymentRequest) (*orchestratorv1.CancelPaymentResponse, error)
 	GetPayment(ctx context.Context, req *orchestratorv1.GetPaymentRequest) (*orchestratorv1.GetPaymentResponse, error)
@@ -31,6 +32,7 @@ type Client interface {
 type grpcOrchestratorClient interface {
 	QuotePayment(ctx context.Context, in *orchestratorv1.QuotePaymentRequest, opts ...grpc.CallOption) (*orchestratorv1.QuotePaymentResponse, error)
 	QuotePayments(ctx context.Context, in *orchestratorv1.QuotePaymentsRequest, opts ...grpc.CallOption) (*orchestratorv1.QuotePaymentsResponse, error)
+	InitiatePayments(ctx context.Context, in *orchestratorv1.InitiatePaymentsRequest, opts ...grpc.CallOption) (*orchestratorv1.InitiatePaymentsResponse, error)
 	InitiatePayment(ctx context.Context, in *orchestratorv1.InitiatePaymentRequest, opts ...grpc.CallOption) (*orchestratorv1.InitiatePaymentResponse, error)
 	CancelPayment(ctx context.Context, in *orchestratorv1.CancelPaymentRequest, opts ...grpc.CallOption) (*orchestratorv1.CancelPaymentResponse, error)
 	GetPayment(ctx context.Context, in *orchestratorv1.GetPaymentRequest, opts ...grpc.CallOption) (*orchestratorv1.GetPaymentResponse, error)
@@ -105,6 +107,12 @@ func (c *orchestratorClient) QuotePayments(ctx context.Context, req *orchestrato
 	return c.client.QuotePayments(ctx, req)
 }

+func (c *orchestratorClient) InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error) {
+	ctx, cancel := c.callContext(ctx)
+	defer cancel()
+	return c.client.InitiatePayments(ctx, req)
+}
+
 func (c *orchestratorClient) InitiatePayment(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error) {
 	ctx, cancel := c.callContext(ctx)
 	defer cancel()
--- a/api/payments/orchestrator/client/fake.go
+++ b/api/payments/orchestrator/client/fake.go
@@ -10,6 +10,7 @@ import (
 type Fake struct {
 	QuotePaymentFn           func(ctx context.Context, req *orchestratorv1.QuotePaymentRequest) (*orchestratorv1.QuotePaymentResponse, error)
 	QuotePaymentsFn          func(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) (*orchestratorv1.QuotePaymentsResponse, error)
+	InitiatePaymentsFn       func(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error)
 	InitiatePaymentFn        func(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error)
 	CancelPaymentFn          func(ctx context.Context, req *orchestratorv1.CancelPaymentRequest) (*orchestratorv1.CancelPaymentResponse, error)
 	GetPaymentFn             func(ctx context.Context, req *orchestratorv1.GetPaymentRequest) (*orchestratorv1.GetPaymentResponse, error)
@@ -34,6 +35,13 @@ func (f *Fake) QuotePayments(ctx context.Context, req *orchestratorv1.QuotePayme
 	return &orchestratorv1.QuotePaymentsResponse{}, nil
 }

+func (f *Fake) InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error) {
+	if f.InitiatePaymentsFn != nil {
+		return f.InitiatePaymentsFn(ctx, req)
+	}
+	return &orchestratorv1.InitiatePaymentsResponse{}, nil
+}
+
 func (f *Fake) InitiatePayment(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error) {
 	if f.InitiatePaymentFn != nil {
 		return f.InitiatePaymentFn(ctx, req)
--- a/api/payments/orchestrator/internal/service/orchestrator/command_factory.go
+++ b/api/payments/orchestrator/internal/service/orchestrator/command_factory.go
@@ -75,6 +75,13 @@ func (f *paymentCommandFactory) InitiatePayment() *initiatePaymentCommand {
 	}
 }

+func (f *paymentCommandFactory) InitiatePayments() *initiatePaymentsCommand {
+	return &initiatePaymentsCommand{
+		engine: f.engine,
+		logger: f.logger.Named("initiate_payments"),
+	}
+}
+
 func (f *paymentCommandFactory) CancelPayment() *cancelPaymentCommand {
 	return &cancelPaymentCommand{
 		engine: f.engine,
--- a/api/payments/orchestrator/internal/service/orchestrator/handlers_commands.go
+++ b/api/payments/orchestrator/internal/service/orchestrator/handlers_commands.go
@@ -146,6 +146,98 @@ func (h *quotePaymentsCommand) Execute(ctx context.Context, req *orchestratorv1.
 	})
 }

+type initiatePaymentsCommand struct {
+	engine paymentEngine
+	logger mlogger.Logger
+}
+
+func (h *initiatePaymentsCommand) Execute(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) gsresponse.Responder[orchestratorv1.InitiatePaymentsResponse] {
+	if err := h.engine.EnsureRepository(ctx); err != nil {
+		return gsresponse.Unavailable[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
+	}
+	if req == nil {
+		return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InvalidArgument("nil request"))
+	}
+	_, orgID, err := validateMetaAndOrgRef(req.GetMeta())
+	if err != nil {
+		return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
+	}
+	idempotencyKey, err := requireIdempotencyKey(req.GetIdempotencyKey())
+	if err != nil {
+		return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
+	}
+	quoteRef := strings.TrimSpace(req.GetQuoteRef())
+	if quoteRef == "" {
+		return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InvalidArgument("quote_ref is required"))
+	}
+
+	quotesStore, err := ensureQuotesStore(h.engine.Repository())
+	if err != nil {
+		return gsresponse.Unavailable[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
+	}
+	record, err := quotesStore.GetByRef(ctx, orgID, quoteRef)
+	if err != nil {
+		if errors.Is(err, storage.ErrQuoteNotFound) {
+			return gsresponse.FailedPrecondition[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, "quote_not_found", merrors.InvalidArgument("quote_ref not found or expired"))
+		}
+		return gsresponse.Auto[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
+	}
+
+	intents := record.Intents
+	quotes := record.Quotes
+	if len(intents) == 0 && record.Intent.Kind != "" && record.Intent.Kind != model.PaymentKindUnspecified {
+		intents = []model.PaymentIntent{record.Intent}
+	}
+	if len(quotes) == 0 && record.Quote != nil {
+		quotes = []*model.PaymentQuoteSnapshot{record.Quote}
+	}
+	if len(intents) == 0 || len(quotes) == 0 || len(intents) != len(quotes) {
+		return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InvalidArgument("stored quote payload is incomplete"))
+	}
+
+	store, err := ensurePaymentsStore(h.engine.Repository())
+	if err != nil {
+		return gsresponse.Unavailable[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
+	}
+
+	payments := make([]*orchestratorv1.Payment, 0, len(intents))
+	for i := range intents {
+		intentProto := protoIntentFromModel(intents[i])
+		if err := requireNonNilIntent(intentProto); err != nil {
+			return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
+		}
+		quoteProto := modelQuoteToProto(quotes[i])
+		if quoteProto == nil {
+			return gsresponse.InvalidArgument[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.InvalidArgument("stored quote is empty"))
+		}
+		quoteProto.QuoteRef = quoteRef
+
+		perKey := perIntentIdempotencyKey(idempotencyKey, i, len(intents))
+		if existing, err := getPaymentByIdempotencyKey(ctx, store, orgID, perKey); err == nil && existing != nil {
+			payments = append(payments, toProtoPayment(existing))
+			continue
+		} else if err != nil && !errors.Is(err, storage.ErrPaymentNotFound) {
+			return gsresponse.Auto[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
+		}
+
+		entity := newPayment(orgID, intentProto, perKey, req.GetMetadata(), quoteProto)
+		if err = store.Create(ctx, entity); err != nil {
+			if errors.Is(err, storage.ErrDuplicatePayment) {
+				return gsresponse.Auto[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, merrors.DataConflict("payment already exists"))
+			}
+			return gsresponse.Auto[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
+		}
+
+		if err := h.engine.ExecutePayment(ctx, store, entity, quoteProto); err != nil {
+			return gsresponse.Auto[orchestratorv1.InitiatePaymentsResponse](h.logger, mservice.PaymentOrchestrator, err)
+		}
+
+		payments = append(payments, toProtoPayment(entity))
+	}
+
+	return gsresponse.Success(&orchestratorv1.InitiatePaymentsResponse{Payments: payments})
+}
+
 type initiatePaymentCommand struct {
 	engine paymentEngine
 	logger mlogger.Logger
--- a/api/payments/orchestrator/internal/service/orchestrator/quote_batch_test.go
+++ b/api/payments/orchestrator/internal/service/orchestrator/quote_batch_test.go
@@ -0,0 +1,102 @@
+package orchestrator
+
+import (
+	"testing"
+	"time"
+
+	"github.com/shopspring/decimal"
+	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
+	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
+	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
+)
+
+func TestAggregatePaymentQuotes(t *testing.T) {
+	quotes := []*orchestratorv1.PaymentQuote{
+		{
+			DebitAmount:              &moneyv1.Money{Amount: "10", Currency: "USD"},
+			ExpectedSettlementAmount: &moneyv1.Money{Amount: "8", Currency: "EUR"},
+			ExpectedFeeTotal:         &moneyv1.Money{Amount: "1", Currency: "USD"},
+			NetworkFee: &chainv1.EstimateTransferFeeResponse{
+				NetworkFee: &moneyv1.Money{Amount: "0.5", Currency: "USD"},
+			},
+		},
+		{
+			DebitAmount:              &moneyv1.Money{Amount: "5", Currency: "USD"},
+			ExpectedSettlementAmount: &moneyv1.Money{Amount: "1000", Currency: "NGN"},
+			ExpectedFeeTotal:         &moneyv1.Money{Amount: "2", Currency: "USD"},
+			NetworkFee: &chainv1.EstimateTransferFeeResponse{
+				NetworkFee: &moneyv1.Money{Amount: "100", Currency: "NGN"},
+			},
+		},
+	}
+
+	agg, err := aggregatePaymentQuotes(quotes)
+	if err != nil {
+		t.Fatalf("aggregatePaymentQuotes returned error: %v", err)
+	}
+
+	assertMoneyTotals(t, agg.GetDebitAmounts(), map[string]string{"USD": "15"})
+	assertMoneyTotals(t, agg.GetExpectedSettlementAmounts(), map[string]string{"EUR": "8", "NGN": "1000"})
+	assertMoneyTotals(t, agg.GetExpectedFeeTotals(), map[string]string{"USD": "3"})
+	assertMoneyTotals(t, agg.GetNetworkFeeTotals(), map[string]string{"USD": "0.5", "NGN": "100"})
+}
+
+func TestAggregatePaymentQuotesInvalidAmount(t *testing.T) {
+	quotes := []*orchestratorv1.PaymentQuote{
+		{
+			DebitAmount: &moneyv1.Money{Amount: "bad", Currency: "USD"},
+		},
+	}
+	if _, err := aggregatePaymentQuotes(quotes); err == nil {
+		t.Fatal("expected error for invalid amount")
+	}
+}
+
+func TestMinQuoteExpiry(t *testing.T) {
+	now := time.Now().UTC()
+	later := now.Add(10 * time.Minute)
+	earliest := now.Add(5 * time.Minute)
+
+	min, ok := minQuoteExpiry([]time.Time{later, time.Time{}, earliest})
+	if !ok {
+		t.Fatal("expected min expiry to be set")
+	}
+	if !min.Equal(earliest) {
+		t.Fatalf("expected min expiry %v, got %v", earliest, min)
+	}
+
+	if _, ok := minQuoteExpiry([]time.Time{time.Time{}}); ok {
+		t.Fatal("expected min expiry to be unset")
+	}
+}
+
+func assertMoneyTotals(t *testing.T, list []*moneyv1.Money, expected map[string]string) {
+	t.Helper()
+	got := make(map[string]decimal.Decimal, len(list))
+	for _, item := range list {
+		if item == nil {
+			continue
+		}
+		val, err := decimal.NewFromString(item.GetAmount())
+		if err != nil {
+			t.Fatalf("invalid money amount %q: %v", item.GetAmount(), err)
+		}
+		got[item.GetCurrency()] = val
+	}
+	if len(got) != len(expected) {
+		t.Fatalf("expected %d totals, got %d", len(expected), len(got))
+	}
+	for currency, amount := range expected {
+		val, err := decimal.NewFromString(amount)
+		if err != nil {
+			t.Fatalf("invalid expected amount %q: %v", amount, err)
+		}
+		gotVal, ok := got[currency]
+		if !ok {
+			t.Fatalf("missing currency %s", currency)
+		}
+		if !gotVal.Equal(val) {
+			t.Fatalf("expected %s %s, got %s", amount, currency, gotVal.String())
+		}
+	}
+}
--- a/api/payments/orchestrator/internal/service/orchestrator/service.go
+++ b/api/payments/orchestrator/internal/service/orchestrator/service.go
@@ -129,6 +129,12 @@ func (s *Service) InitiatePayment(ctx context.Context, req *orchestratorv1.Initi
 	return executeUnary(ctx, s, "InitiatePayment", s.h.commands.InitiatePayment().Execute, req)
 }

+// InitiatePayments executes multiple payments using a stored quote reference.
+func (s *Service) InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error) {
+	s.ensureHandlers()
+	return executeUnary(ctx, s, "InitiatePayments", s.h.commands.InitiatePayments().Execute, req)
+}
+
 // CancelPayment attempts to cancel an in-flight payment.
 func (s *Service) CancelPayment(ctx context.Context, req *orchestratorv1.CancelPaymentRequest) (*orchestratorv1.CancelPaymentResponse, error) {
 	s.ensureHandlers()
--- a/api/proto/payments/orchestrator/v1/orchestrator.proto
+++ b/api/proto/payments/orchestrator/v1/orchestrator.proto
@@ -192,6 +192,17 @@ message QuotePaymentsResponse {
  repeated PaymentQuote quotes = 3;
 }

+message InitiatePaymentsRequest {
+  RequestMeta meta = 1;
+  string idempotency_key = 2;
+  string quote_ref = 3;
+  map<string, string> metadata = 4;
+}
+
+message InitiatePaymentsResponse {
+  repeated Payment payments = 1;
+}
+
 message InitiatePaymentRequest {
  RequestMeta meta = 1;
  string idempotency_key = 2;
@@ -280,6 +291,7 @@ message InitiateConversionResponse {
 service PaymentOrchestrator {
  rpc QuotePayment(QuotePaymentRequest) returns (QuotePaymentResponse);
  rpc QuotePayments(QuotePaymentsRequest) returns (QuotePaymentsResponse);
+  rpc InitiatePayments(InitiatePaymentsRequest) returns (InitiatePaymentsResponse);
  rpc InitiatePayment(InitiatePaymentRequest) returns (InitiatePaymentResponse);
  rpc CancelPayment(CancelPaymentRequest) returns (CancelPaymentResponse);
  rpc GetPayment(GetPaymentRequest) returns (GetPaymentResponse);
--- a/api/server/interface/api/srequest/payment.go
+++ b/api/server/interface/api/srequest/payment.go
@@ -89,3 +89,18 @@ func (r InitiatePayment) Validate() error {

 	return nil
 }
+
+type InitiatePayments struct {
+	PaymentBase `json:",inline"`
+	QuoteRef    string `json:"quoteRef,omitempty"`
+}
+
+func (r InitiatePayments) Validate() error {
+	if err := r.PaymentBase.Validate(); err != nil {
+		return err
+	}
+	if r.QuoteRef == "" {
+		return merrors.InvalidArgument("quoteRef is required", "quoteRef")
+	}
+	return nil
+}
--- a/api/server/interface/api/sresponse/payment.go
+++ b/api/server/interface/api/sresponse/payment.go
@@ -81,6 +81,11 @@ type paymentQuotesResponse struct {
 	Quote        *PaymentQuotes `json:"quote"`
 }

+type paymentsResponse struct {
+	authResponse `json:",inline"`
+	Payments     []Payment `json:"payments"`
+}
+
 type paymentResponse struct {
 	authResponse `json:",inline"`
 	Payment      *Payment `json:"payment"`
@@ -102,6 +107,14 @@ func PaymentQuotesResponse(logger mlogger.Logger, resp *orchestratorv1.QuotePaym
 	})
 }

+// Payments wraps a list of payments with refreshed access token.
+func PaymentsResponse(logger mlogger.Logger, payments []*orchestratorv1.Payment, token *TokenData) http.HandlerFunc {
+	return response.Ok(logger, paymentsResponse{
+		Payments:     toPayments(payments),
+		authResponse: authResponse{AccessToken: *token},
+	})
+}
+
 // Payment wraps a payment with refreshed access token.
 func PaymentResponse(logger mlogger.Logger, payment *orchestratorv1.Payment, token *TokenData) http.HandlerFunc {
 	return response.Ok(logger, paymentResponse{
@@ -216,6 +229,22 @@ func toPaymentQuotes(resp *orchestratorv1.QuotePaymentsResponse) *PaymentQuotes
 	}
 }

+func toPayments(items []*orchestratorv1.Payment) []Payment {
+	if len(items) == 0 {
+		return nil
+	}
+	result := make([]Payment, 0, len(items))
+	for _, item := range items {
+		if p := toPayment(item); p != nil {
+			result = append(result, *p)
+		}
+	}
+	if len(result) == 0 {
+		return nil
+	}
+	return result
+}
+
 func toPayment(p *orchestratorv1.Payment) *Payment {
 	if p == nil {
 		return nil
--- a/api/server/internal/server/paymentapiimp/paybatch.go
+++ b/api/server/internal/server/paymentapiimp/paybatch.go
@@ -0,0 +1,74 @@
+package paymentapiimp
+
+import (
+	"encoding/json"
+	"net/http"
+	"strings"
+
+	"github.com/tech/sendico/pkg/api/http/response"
+	"github.com/tech/sendico/pkg/merrors"
+	"github.com/tech/sendico/pkg/model"
+	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
+	"github.com/tech/sendico/server/interface/api/srequest"
+	"github.com/tech/sendico/server/interface/api/sresponse"
+	mutil "github.com/tech/sendico/server/internal/mutil/param"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.uber.org/zap"
+)
+
+func (a *PaymentAPI) initiatePaymentsByQuote(r *http.Request, account *model.Account, token *sresponse.TokenData) http.HandlerFunc {
+	orgRef, err := a.oph.GetRef(r)
+	if err != nil {
+		a.logger.Warn("Failed to parse organization reference for batch payment initiation", zap.Error(err), zap.String(a.oph.Name(), a.oph.GetID(r)))
+		return response.BadReference(a.logger, a.Name(), a.oph.Name(), a.oph.GetID(r), err)
+	}
+
+	ctx := r.Context()
+	allowed, err := a.enf.Enforce(ctx, a.permissionRef, account.ID, orgRef, primitive.NilObjectID, model.ActionCreate)
+	if err != nil {
+		a.logger.Warn("Failed to check payments access permissions", zap.Error(err), mutil.PLog(a.oph, r))
+		return response.Auto(a.logger, a.Name(), err)
+	}
+	if !allowed {
+		a.logger.Debug("Access denied when initiating batch payments", mutil.PLog(a.oph, r))
+		return response.AccessDenied(a.logger, a.Name(), "payments write permission denied")
+	}
+
+	payload, err := decodeInitiatePaymentsPayload(r)
+	if err != nil {
+		return response.BadPayload(a.logger, a.Name(), err)
+	}
+
+	req := &orchestratorv1.InitiatePaymentsRequest{
+		Meta: &orchestratorv1.RequestMeta{
+			OrganizationRef: orgRef.Hex(),
+		},
+		IdempotencyKey: strings.TrimSpace(payload.IdempotencyKey),
+		QuoteRef:       strings.TrimSpace(payload.QuoteRef),
+		Metadata:       payload.Metadata,
+	}
+
+	resp, err := a.client.InitiatePayments(ctx, req)
+	if err != nil {
+		a.logger.Warn("Failed to initiate batch payments", zap.Error(err), zap.String("organization_ref", orgRef.Hex()))
+		return response.Auto(a.logger, a.Name(), err)
+	}
+
+	return sresponse.PaymentsResponse(a.logger, resp.GetPayments(), token)
+}
+
+func decodeInitiatePaymentsPayload(r *http.Request) (*srequest.InitiatePayments, error) {
+	defer r.Body.Close()
+
+	payload := &srequest.InitiatePayments{}
+	if err := json.NewDecoder(r.Body).Decode(payload); err != nil {
+		return nil, merrors.InvalidArgument("invalid payload: " + err.Error())
+	}
+	payload.IdempotencyKey = strings.TrimSpace(payload.IdempotencyKey)
+	payload.QuoteRef = strings.TrimSpace(payload.QuoteRef)
+
+	if err := payload.Validate(); err != nil {
+		return nil, err
+	}
+	return payload, nil
+}
--- a/api/server/internal/server/paymentapiimp/service.go
+++ b/api/server/internal/server/paymentapiimp/service.go
@@ -23,6 +23,7 @@ import (
 type paymentClient interface {
 	QuotePayment(ctx context.Context, req *orchestratorv1.QuotePaymentRequest) (*orchestratorv1.QuotePaymentResponse, error)
 	QuotePayments(ctx context.Context, req *orchestratorv1.QuotePaymentsRequest) (*orchestratorv1.QuotePaymentsResponse, error)
+	InitiatePayments(ctx context.Context, req *orchestratorv1.InitiatePaymentsRequest) (*orchestratorv1.InitiatePaymentsResponse, error)
 	InitiatePayment(ctx context.Context, req *orchestratorv1.InitiatePaymentRequest) (*orchestratorv1.InitiatePaymentResponse, error)
 	Close() error
 }
@@ -67,9 +68,10 @@ func CreateAPI(apiCtx eapi.API) (*PaymentAPI, error) {
 	}

 	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/quote"), api.Post, p.quotePayment)
-	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/quote-multiple"), api.Post, p.quotePayments)
+	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/multiquote"), api.Post, p.quotePayments)
 	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/immediate"), api.Post, p.initiateImmediate)
 	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/by-quote"), api.Post, p.initiateByQuote)
+	apiCtx.Register().AccountHandler(p.Name(), p.oph.AddRef("/by-multiquote"), api.Post, p.initiatePaymentsByQuote)

 	return p, nil
 }
--- a/frontend/pshared/lib/api/requests/username.dart
+++ b/frontend/pshared/lib/api/requests/username.dart
@@ -0,0 +1,20 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'username.g.dart';
+
+
+@JsonSerializable()
+class ResetUserNameRequest {
+  final String userName;
+
+  const ResetUserNameRequest({
+    required this.userName,
+  });
+
+  factory ResetUserNameRequest.fromJson(Map<String, dynamic> json) => _$ResetUserNameRequestFromJson(json);
+  Map<String, dynamic> toJson() => _$ResetUserNameRequestToJson(this);
+
+  static ResetUserNameRequest build({
+    required String userName,
+  }) => ResetUserNameRequest(userName: userName);
+} 
--- a/frontend/pshared/lib/provider/account.dart
+++ b/frontend/pshared/lib/provider/account.dart
@@ -228,6 +228,19 @@ class AccountProvider extends ChangeNotifier {
    }
  }

+  Future<Account> resetUsername(String userName) async {
+    if (account == null) throw ErrorUnauthorized();
+    _setResource(_resource.copyWith(isLoading: true, error: null));
+    try {
+      final updated = await AccountService.resetUsername(account!, userName);
+      _setResource(Resource(data: updated, isLoading: false));
+      return updated;
+    } catch (e) {
+      _setResource(_resource.copyWith(isLoading: false, error: toException(e)));
+      rethrow;
+    }
+  }
+
  Future<void> forgotPassword(String email) async {
    _setResource(_resource.copyWith(isLoading: true, error: null));
    try {
--- a/frontend/pshared/lib/service/account.dart
+++ b/frontend/pshared/lib/service/account.dart
@@ -1,5 +1,4 @@
 import 'package:logging/logging.dart';
-
 import 'package:share_plus/share_plus.dart';

 import 'package:pshared/api/requests/signup.dart';
@@ -10,6 +9,7 @@ import 'package:pshared/api/requests/password/forgot.dart';
 import 'package:pshared/api/requests/password/reset.dart';
 import 'package:pshared/data/mapper/account/account.dart';
 import 'package:pshared/models/account/account.dart';
+import 'package:pshared/models/describable.dart';
 import 'package:pshared/models/auth/login_outcome.dart';
 import 'package:pshared/service/authorization/service.dart';
 import 'package:pshared/service/files.dart';
@@ -61,6 +61,14 @@ class AccountService {
    await getPOSTResponse(_objectType, 'password/reset/$accountRef/$token', ResetPasswordRequest.build(password: newPassword).toJson());
  }

+  static Future<Account> resetUsername(Account account, String userName) async {
+    _logger.fine('Updating username for account: ${account.id}');
+    final updatedAccount = account.copyWith(
+      describable: account.describable.copyWith(name: userName),
+    );
+    return update(updatedAccount);
+  }
+
  static Future<Account> changePassword(String oldPassword, String newPassword) async {
    _logger.fine('Changing password');
    return _getAccount(AuthorizationService.getPATCHResponse(
--- a/frontend/pweb/lib/l10n/en.arb
+++ b/frontend/pweb/lib/l10n/en.arb
@@ -9,7 +9,13 @@
  "usernameErrorInvalid": "Provide a valid email address",
  "usernameUnknownTLD": "Domain .{domain} is not known, please, check it",
  "password": "Password",
+  "oldPassword": "Current password",
+  "newPassword": "New password",
  "confirmPassword": "Confirm password",
+  "changePassword": "Change password",
+  "savePassword": "Save changed password",
+  "changePasswordSuccess": "Password updated",
+  "changePasswordError": "Could not update password",
  "passwordValidationRuleDigit": "has digit",
  "passwordValidationRuleUpperCase": "has uppercase letter",
  "passwordValidationRuleLowerCase": "has lowercase letter",
--- a/frontend/pweb/lib/l10n/ru.arb
+++ b/frontend/pweb/lib/l10n/ru.arb
@@ -9,7 +9,13 @@
  "usernameErrorInvalid": "Укажите действительный адрес электронной почты",
  "usernameUnknownTLD": "Домен .{domain} неизвестен, пожалуйста, проверьте его",
  "password": "Пароль",
+  "oldPassword": "Текущий пароль",
+  "newPassword": "Новый пароль",
  "confirmPassword": "Подтвердите пароль",
+  "changePassword": "Изменить пароль",
+  "savePassword": "Сохранить пароль",
+  "changePasswordSuccess": "Пароль обновлен",
+  "changePasswordError": "Не удалось обновить пароль",
  "passwordValidationRuleDigit": "содержит цифру",
  "passwordValidationRuleUpperCase": "содержит заглавную букву",
  "passwordValidationRuleLowerCase": "содержит строчную букву",
--- a/frontend/pweb/lib/models/edit_state.dart
+++ b/frontend/pweb/lib/models/edit_state.dart
@@ -0,0 +1 @@
+enum EditState { view, edit, saving }
--- a/frontend/pweb/lib/pages/settings/profile/account/name.dart
+++ b/frontend/pweb/lib/pages/settings/profile/account/name.dart
@@ -1,5 +1,9 @@
 import 'package:flutter/material.dart';

+import 'package:provider/provider.dart';
+
+import 'package:pweb/models/edit_state.dart';
+import 'package:pshared/provider/account.dart';

 class AccountName extends StatefulWidget {
  final String name;
@@ -26,8 +30,9 @@ class _AccountNameState extends State<AccountName> {
  static const double _borderWidth = 2;

  late final TextEditingController _controller;
-  bool _isEditing = false;
+  EditState _editState = EditState.view;
  late String _originalName;
+  String _errorText = '';

  @override
  void initState() {
@@ -42,33 +47,75 @@ class _AccountNameState extends State<AccountName> {
    super.dispose();
  }

-  void _startEditing() => setState(() => _isEditing = true);
+  void _startEditing() => setState(() => _editState = EditState.edit);

  void _cancelEditing() {
    setState(() {
      _controller.text = _originalName;
-      _isEditing = false;
+      _editState = EditState.view;
+      _errorText = '';
    });
  }

-  void _saveEditing() {
+  Future<void> _saveEditing(AccountProvider provider) async {
+    final newName = _controller.text.trim();
+    if (newName.isEmpty || newName == _originalName) {
+      _cancelEditing();
+      return;
+    }
+
    setState(() {
-      _originalName = _controller.text;
-      _isEditing = false;
+      _editState = EditState.saving;
+      _errorText = '';
    });
+
+    try {
+      await provider.resetUsername(newName);
+      if (!mounted) return;
+      setState(() {
+        _originalName = newName;
+        _editState = EditState.view;
+      });
+    } catch (_) {
+      if (!mounted) return;
+      setState(() {
+        _errorText = widget.errorText;
+        _editState = EditState.edit;
+      });
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(widget.errorText)),
+      );
+      return;
+    } finally {
+      if (!mounted) return;
+      if (_editState == EditState.saving) {
+        setState(() => _editState = EditState.edit);
+      }
+    }
  }

  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);

+    return Consumer<AccountProvider>(
+      builder: (context, provider, _) {
+        final isEditing = _editState != EditState.view;
+        final currentName = provider.account?.name ?? _originalName;
+        final isBusy = provider.isLoading || _editState == EditState.saving;
+
+        if (!isEditing && currentName != _originalName) {
+          _originalName = currentName;
+          _controller.text = currentName;
+        }
+
        return Column(
          mainAxisSize: MainAxisSize.min,
          children: [
            Row(
              mainAxisAlignment: MainAxisAlignment.center,
              children: [
-            if (_isEditing)
+                if (isEditing)
                  SizedBox(
                    width: _inputWidth,
                    child: TextFormField(
@@ -77,6 +124,7 @@ class _AccountNameState extends State<AccountName> {
                        fontWeight: FontWeight.bold,
                      ),
                      autofocus: true,
+                      enabled: !isBusy,
                      decoration: InputDecoration(
                        hintText: widget.hintText,
                        isDense: true,
@@ -97,31 +145,33 @@ class _AccountNameState extends State<AccountName> {
                    ),
                  ),
                const SizedBox(width: _spacing),
-            if (_isEditing) ...[
+                if (isEditing) ...[
                  IconButton(
                    icon: Icon(Icons.check, color: theme.colorScheme.primary),
-                onPressed: _saveEditing,
+                    onPressed: isBusy ? null : () => _saveEditing(provider),
                  ),
                  IconButton(
                    icon: Icon(Icons.close, color: theme.colorScheme.error),
-                onPressed: _cancelEditing,
+                    onPressed: isBusy ? null : _cancelEditing,
                  ),
                ] else
                  IconButton(
                    icon: Icon(Icons.edit, color: theme.colorScheme.primary),
-                onPressed: _startEditing,
+                    onPressed: isBusy ? null : _startEditing,
                  ),
              ],
            ),
            const SizedBox(height: _errorSpacing),
-        if (widget.errorText.isEmpty)
+            if (_errorText.isNotEmpty)
              Text(
-            widget.errorText,
+                _errorText,
                style: theme.textTheme.bodySmall?.copyWith(
                  color: theme.colorScheme.error,
                ),
              ),
          ],
        );
+      },
+    );
  }
 }
--- a/frontend/pweb/lib/pages/settings/profile/account/password/form.dart
+++ b/frontend/pweb/lib/pages/settings/profile/account/password/form.dart
@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+
+import 'package:pshared/provider/account.dart';
+
+import 'package:pweb/providers/password_form.dart';
+
+import 'package:pweb/generated/i18n/app_localizations.dart';
+
+
+class PasswordForm extends StatelessWidget {
+  const PasswordForm({
+    super.key,
+    required this.formProvider,
+    required this.accountProvider,
+    required this.isBusy,
+    required this.oldPasswordLabel,
+    required this.newPasswordLabel,
+    required this.confirmPasswordLabel,
+    required this.savePassword,
+    required this.successText,
+    required this.errorText,
+    required this.loc,
+  });
+
+  static const double _fieldWidth = 320;
+  static const double _gapMedium = 12;
+  static const double _gapSmall = 8;
+
+  final PasswordFormProvider formProvider;
+  final AccountProvider accountProvider;
+  final bool isBusy;
+  final String oldPasswordLabel;
+  final String newPasswordLabel;
+  final String confirmPasswordLabel;
+  final String savePassword;
+  final String successText;
+  final String errorText;
+  final AppLocalizations loc;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final isFormBusy = isBusy || formProvider.isSaving;
+
+    return Column(
+      children: [
+        const SizedBox(height: _gapMedium),
+        Form(
+          key: formProvider.formKey,
+          child: Column(
+            children: [
+              SizedBox(
+                width: _fieldWidth,
+                child: TextFormField(
+                  controller: formProvider.oldPasswordController,
+                  obscureText: true,
+                  enabled: !isFormBusy,
+                  decoration: InputDecoration(
+                    labelText: oldPasswordLabel,
+                    border: const OutlineInputBorder(),
+                  ),
+                  validator: (value) =>
+                      (value == null || value.isEmpty) ? loc.errorPasswordMissing : null,
+                ),
+              ),
+              const SizedBox(height: _gapSmall),
+              SizedBox(
+                width: _fieldWidth,
+                child: TextFormField(
+                  controller: formProvider.newPasswordController,
+                  obscureText: true,
+                  enabled: !isFormBusy,
+                  decoration: InputDecoration(
+                    labelText: newPasswordLabel,
+                    border: const OutlineInputBorder(),
+                  ),
+                  validator: (value) =>
+                      (value == null || value.isEmpty) ? loc.errorPasswordMissing : null,
+                ),
+              ),
+              const SizedBox(height: _gapSmall),
+              SizedBox(
+                width: _fieldWidth,
+                child: TextFormField(
+                  controller: formProvider.confirmPasswordController,
+                  obscureText: true,
+                  enabled: !isFormBusy,
+                  decoration: InputDecoration(
+                    labelText: confirmPasswordLabel,
+                    border: const OutlineInputBorder(),
+                  ),
+                  validator: (value) {
+                    if (value == null || value.isEmpty) return loc.errorPasswordMissing;
+                    if (value != formProvider.newPasswordController.text) {
+                      return loc.passwordsDoNotMatch;
+                    }
+                    return null;
+                  },
+                ),
+              ),
+              const SizedBox(height: _gapMedium),
+              ElevatedButton.icon(
+                onPressed: isFormBusy
+                    ? null
+                    : () => formProvider.submit(
+                          context: context,
+                          accountProvider: accountProvider,
+                          successText: successText,
+                          errorText: errorText,
+                        ),
+                icon: const Icon(Icons.save_outlined),
+                label: Text(savePassword),
+              ),
+              if (formProvider.errorText.isNotEmpty) ...[
+                const SizedBox(height: _gapSmall),
+                Text(
+                  formProvider.errorText,
+                  style: theme.textTheme.bodySmall?.copyWith(
+                    color: theme.colorScheme.error,
+                  ),
+                ),
+              ],
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/settings/profile/account/password/password.dart
+++ b/frontend/pweb/lib/pages/settings/profile/account/password/password.dart
@@ -0,0 +1,187 @@
+import 'package:flutter/material.dart';
+
+import 'package:provider/provider.dart';
+
+import 'package:pshared/provider/account.dart';
+import 'package:pshared/utils/snackbar.dart';
+
+import 'package:pweb/models/edit_state.dart';
+import 'package:pweb/utils/error/snackbar.dart';
+
+import 'package:pweb/generated/i18n/app_localizations.dart';
+
+
+class AccountPassword extends StatefulWidget {
+  final String title;
+  final String successText;
+  final String errorText;
+  final String oldPasswordLabel;
+  final String newPasswordLabel;
+  final String confirmPasswordLabel;
+  final String savePassword;
+
+  const AccountPassword({
+    super.key,
+    required this.title,
+    required this.successText,
+    required this.errorText,
+    required this.oldPasswordLabel,
+    required this.newPasswordLabel,
+    required this.confirmPasswordLabel,
+    required this.savePassword,
+  });
+
+  @override
+  State<AccountPassword> createState() => _AccountPasswordState();
+}
+
+class _AccountPasswordState extends State<AccountPassword> {
+  static const double _fieldWidth = 320;
+  static const double _gapMedium = 12;
+  static const double _gapSmall = 8;
+
+  final _formKey = GlobalKey<FormState>();
+  final _oldPasswordController = TextEditingController();
+  final _newPasswordController = TextEditingController();
+  final _confirmPasswordController = TextEditingController();
+
+  EditState _state = EditState.view;
+  String _errorText = '';
+
+  bool get _isSaving => _state == EditState.saving;
+  bool get _isExpanded => _state != EditState.view;
+
+  @override
+  void dispose() {
+    _oldPasswordController.dispose();
+    _newPasswordController.dispose();
+    _confirmPasswordController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _changePassword(AccountProvider provider) async {
+    if (!_formKey.currentState!.validate()) return;
+
+    setState(() {
+      _state = EditState.saving;
+      _errorText = '';
+    });
+
+    try {
+      await provider.changePassword(_oldPasswordController.text, _newPasswordController.text);
+      if (!mounted) return;
+      _oldPasswordController.clear();
+      _newPasswordController.clear();
+      _confirmPasswordController.clear();
+      notifyUser(context, widget.successText);
+    } catch (e) {
+      if (!mounted) return;
+      setState(() => _errorText = widget.errorText);
+      await postNotifyUserOfErrorX(
+        context: context,
+        errorSituation: widget.errorText,
+        exception: e,
+      );
+    } finally {
+      if (mounted) {
+        setState(() => _state = EditState.edit);
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final loc = AppLocalizations.of(context)!;
+
+    return Consumer<AccountProvider>(
+      builder: (context, provider, _) {
+        final isBusy = provider.isLoading || _isSaving;
+
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            TextButton.icon(
+              onPressed: isBusy
+                  ? null
+                  : () => setState(() {
+                        _state = _isExpanded ? EditState.view : EditState.edit;
+                        _errorText = '';
+                      }),
+              icon: Icon(Icons.lock_outline, color: theme.colorScheme.primary),
+              label: Text(widget.title, style: theme.textTheme.bodyMedium),
+            ),
+            if (_isExpanded) ...[
+              const SizedBox(height: _gapMedium),
+              Form(
+                key: _formKey,
+                child: Column(
+                  children: [
+                    SizedBox(
+                      width: _fieldWidth,
+                      child: TextFormField(
+                        controller: _oldPasswordController,
+                        obscureText: true,
+                        enabled: !isBusy,
+                        decoration: InputDecoration(
+                          labelText: widget.oldPasswordLabel,
+                          border: const OutlineInputBorder(),
+                        ),
+                        validator: (value) => (value == null || value.isEmpty) ? loc.errorPasswordMissing : null,
+                      ),
+                    ),
+                    const SizedBox(height: _gapSmall),
+                    SizedBox(
+                      width: _fieldWidth,
+                      child: TextFormField(
+                        controller: _newPasswordController,
+                        obscureText: true,
+                        enabled: !isBusy,
+                        decoration: InputDecoration(
+                          labelText: widget.newPasswordLabel,
+                          border: const OutlineInputBorder(),
+                        ),
+                        validator: (value) => (value == null || value.isEmpty) ? loc.errorPasswordMissing : null,
+                      ),
+                    ),
+                    const SizedBox(height: _gapSmall),
+                    SizedBox(
+                      width: _fieldWidth,
+                      child: TextFormField(
+                        controller: _confirmPasswordController,
+                        obscureText: true,
+                        enabled: !isBusy,
+                        decoration: InputDecoration(
+                          labelText: widget.confirmPasswordLabel,
+                          border: const OutlineInputBorder(),
+                        ),
+                        validator: (value) {
+                          if (value == null || value.isEmpty) return loc.errorPasswordMissing;
+                          if (value != _newPasswordController.text) return loc.passwordsDoNotMatch;
+                          return null;
+                        },
+                      ),
+                    ),
+                    const SizedBox(height: _gapMedium),
+                    ElevatedButton.icon(
+                      onPressed: isBusy ? null : () => _changePassword(provider),
+                      icon: const Icon(Icons.save_outlined),
+                      label: Text(widget.savePassword),
+                    ),
+                    if (_errorText.isNotEmpty) ...[
+                      const SizedBox(height: _gapSmall),
+                      Text(
+                        _errorText,
+                        style: theme.textTheme.bodySmall?.copyWith(color: theme.colorScheme.error),
+                      ),
+                    ],
+                  ],
+                ),
+              ),
+            ],
+          ],
+        );
+      },
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/settings/profile/account/password/toggle_button.dart
+++ b/frontend/pweb/lib/pages/settings/profile/account/password/toggle_button.dart
@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+
+
+class PasswordToggleButton extends StatelessWidget {
+  const PasswordToggleButton({
+    super.key,
+    required this.title,
+    required this.isExpanded,
+    required this.isBusy,
+    required this.onToggle,
+  });
+
+  final String title;
+  final bool isExpanded;
+  final bool isBusy;
+  final VoidCallback onToggle;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final iconColor = theme.colorScheme.primary;
+
+    return TextButton.icon(
+      onPressed: isBusy
+          ? null
+          : () {
+              onToggle();
+            },
+      icon: Icon(
+        isExpanded ? Icons.lock_open : Icons.lock_outline,
+        color: iconColor,
+      ),
+      label: Text(title, style: theme.textTheme.bodyMedium),
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/settings/profile/page.dart
+++ b/frontend/pweb/lib/pages/settings/profile/page.dart
@@ -1,8 +1,13 @@
 import 'package:flutter/material.dart';

+import 'package:provider/provider.dart';
+
+import 'package:pshared/provider/account.dart';
+
 import 'package:pweb/pages/settings/profile/account/avatar.dart';
 import 'package:pweb/pages/settings/profile/account/locale.dart';
 import 'package:pweb/pages/settings/profile/account/name.dart';
+import 'package:pweb/pages/settings/profile/account/password/password.dart';

 import 'package:pweb/generated/i18n/app_localizations.dart';

@@ -18,11 +23,15 @@ class ProfileSettingsPage extends StatelessWidget {
  Widget build(BuildContext context) {
    final loc = AppLocalizations.of(context)!;
    final theme = Theme.of(context);
+    final accountName = context.select<AccountProvider, String?>(
+      (provider) => provider.account?.describable.name,
+    );

-    return Material(
+    return Align(
+      alignment: Alignment.topCenter,
+      child: Material(
        elevation: 4,
        borderRadius: BorderRadius.circular(_cardRadius),
-      clipBehavior: Clip.antiAlias,
        color: theme.colorScheme.onSecondary,
        child: Padding(
          padding: _cardPadding,
@@ -37,17 +46,27 @@ class ProfileSettingsPage extends StatelessWidget {
                errorText: loc.avatarUpdateError,
              ),
              AccountName(
-              name: loc.userNamePlaceholder,
+                name: accountName ?? loc.userNamePlaceholder,
                title: loc.accountName,
                hintText: loc.accountNameHint,
                errorText: loc.accountNameUpdateError,
              ),
+              AccountPassword(
+                title: loc.changePassword,
+                successText: loc.changePasswordSuccess,
+                errorText: loc.changePasswordError,
+                oldPasswordLabel: loc.oldPassword,
+                newPasswordLabel: loc.newPassword,
+                confirmPasswordLabel: loc.confirmPassword,
+                savePassword: loc.savePassword,
+              ),
              LocalePicker(
                title: loc.language,
              ),
            ],
          ),
        ),
+      ),
    );
  }
 }
--- a/frontend/pweb/lib/pages/settings/widgets/base.dart
+++ b/frontend/pweb/lib/pages/settings/widgets/base.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';

 import 'package:flutter_settings_ui/flutter_settings_ui.dart';
-import 'package:pweb/generated/i18n/app_localizations.dart';
+
+import 'package:pweb/models/edit_state.dart';
 import 'package:pweb/utils/error/snackbar.dart';

-enum _EditState { view, edit, saving }
+import 'package:pweb/generated/i18n/app_localizations.dart';
+

-/// Базовый класс, управляющий состояниями (view/edit/saving),
-/// показом snackbar ошибок и успешного сохранения.
 abstract class BaseEditTile<T> extends AbstractSettingsTile {
  const BaseEditTile({
    super.key,
@@ -24,11 +24,8 @@ abstract class BaseEditTile<T> extends AbstractSettingsTile {
  final Future<void> Function(T) valueSetter;
  final String errorSituation;

-  /// Рисует в режиме просмотра (read-only).
  Widget buildView(BuildContext context, T? value);

-  /// Рисует UI редактора.
-  /// Если [useDialogEditor]==true, его обернут в диалог.
  Widget buildEditor(
    BuildContext context,
    T? initial,
@@ -37,7 +34,6 @@ abstract class BaseEditTile<T> extends AbstractSettingsTile {
    bool isSaving,
  );

-  /// true → показывать редактор в диалоге, false → inline под заголовком.
  bool get useDialogEditor => false;

  @override
@@ -52,16 +48,16 @@ class _BaseEditTileBody<T> extends StatefulWidget {
 }

 class _BaseEditTileBodyState<T> extends State<_BaseEditTileBody<T>> {
-  _EditState _state = _EditState.view;
-  bool get _isSaving => _state == _EditState.saving;
+  EditState _state = EditState.view;
+  bool get _isSaving => _state == EditState.saving;

  Future<void> _performSave(T newValue) async {
    final current = widget.delegate.valueGetter();
    if (newValue == current) {
-      setState(() => _state = _EditState.view);
+      setState(() => _state = EditState.view);
      return;
    }
-    setState(() => _state = _EditState.saving);
+    setState(() => _state = EditState.saving);
    final sms = ScaffoldMessenger.of(context);
    final locs = AppLocalizations.of(context)!;
    try {
@@ -78,7 +74,7 @@ class _BaseEditTileBodyState<T> extends State<_BaseEditTileBody<T>> {
        exception: e,
      );
    } finally {
-      if (mounted) setState(() => _state = _EditState.view);
+      if (mounted) setState(() => _state = EditState.view);
    }
  }

@@ -112,7 +108,6 @@ class _BaseEditTileBodyState<T> extends State<_BaseEditTileBody<T>> {
    final delegate = widget.delegate;
    final current = delegate.valueGetter();

-    // Диалоговый режим
    if (delegate.useDialogEditor) {
      return SettingsTile.navigation(
        leading: Icon(delegate.icon),
@@ -122,21 +117,20 @@ class _BaseEditTileBodyState<T> extends State<_BaseEditTileBody<T>> {
      );
    }

-    // Inline-режим (под заголовком будет редактор прямо в tile)
    return SettingsTile.navigation(
      leading: Icon(delegate.icon),
      title: Text(delegate.title),
-      value: _state == _EditState.view
+      value: _state == EditState.view
          ? delegate.buildView(context, current)
          : delegate.buildEditor(
              context,
              current,
              _performSave,
-              () => setState(() => _state = _EditState.view),
+              () => setState(() => _state = EditState.view),
              _isSaving,
            ),
      onPressed: (_) {
-        if (_state == _EditState.view) setState(() => _state = _EditState.edit);
+        if (_state == EditState.view) setState(() => _state = EditState.edit);
      },
    );
  }
--- a/frontend/pweb/lib/providers/password_form.dart
+++ b/frontend/pweb/lib/providers/password_form.dart
@@ -0,0 +1,87 @@
+import 'package:flutter/material.dart';
+
+import 'package:pshared/provider/account.dart';
+import 'package:pshared/utils/snackbar.dart';
+
+import 'package:pweb/models/edit_state.dart';
+import 'package:pweb/utils/error/snackbar.dart';
+
+
+class PasswordFormProvider extends ChangeNotifier {
+  final formKey = GlobalKey<FormState>();
+  final oldPasswordController = TextEditingController();
+  final newPasswordController = TextEditingController();
+  final confirmPasswordController = TextEditingController();
+
+  EditState _state = EditState.view;
+  String _errorText = '';
+  bool _disposed = false;
+
+  bool get isExpanded => _state != EditState.view;
+  bool get isSaving => _state == EditState.saving;
+  String get errorText => _errorText;
+  EditState get state => _state;
+
+  void toggleExpanded() {
+    if (_state == EditState.saving) return;
+    _setState(_state == EditState.view ? EditState.edit : EditState.view);
+    _setError('');
+  }
+
+  Future<void> submit({
+    required BuildContext context,
+    required AccountProvider accountProvider,
+    required String successText,
+    required String errorText,
+  }) async {
+    final currentForm = formKey.currentState;
+    if (currentForm == null || !currentForm.validate()) return;
+
+    _setState(EditState.saving);
+    _setError('');
+
+    try {
+      await accountProvider.changePassword(
+        oldPasswordController.text,
+        newPasswordController.text,
+      );
+
+      oldPasswordController.clear();
+      newPasswordController.clear();
+      confirmPasswordController.clear();
+      if (!context.mounted) return;
+      notifyUser(context, successText);
+    } catch (e) {
+      _setError(errorText);
+      if (!context.mounted) return;
+      await postNotifyUserOfErrorX(
+        context: context,
+        errorSituation: errorText,
+        exception: e,
+      );
+    } finally {
+      _setState(EditState.edit);
+    }
+  }
+
+  void _setState(EditState value) {
+    if (_state == value || _disposed) return;
+    _state = value;
+    notifyListeners();
+  }
+
+  void _setError(String value) {
+    if (_disposed) return;
+    _errorText = value;
+    notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    _disposed = true;
+    oldPasswordController.dispose();
+    newPasswordController.dispose();
+    confirmPasswordController.dispose();
+    super.dispose();
+  }
+}
--- a/frontend/pweb/lib/widgets/sidebar/sidebar.dart
+++ b/frontend/pweb/lib/widgets/sidebar/sidebar.dart
@@ -1,5 +1,9 @@
 import 'package:flutter/material.dart';

+import 'package:provider/provider.dart';
+
+import 'package:pshared/provider/account.dart';
+
 import 'package:pweb/widgets/sidebar/destinations.dart';
 import 'package:pweb/widgets/sidebar/side_menu.dart';
 import 'package:pweb/widgets/sidebar/user.dart';
@@ -18,7 +22,7 @@ class PayoutSidebar extends StatelessWidget {

  final PayoutDestination selected;
  final ValueChanged<PayoutDestination> onSelected;
-  final VoidCallback? onLogout;
+  final Future<void> Function()? onLogout;

  final String? userName;
  final String? avatarUrl;
@@ -27,6 +31,15 @@ class PayoutSidebar extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final accountName = context.select<AccountProvider, String?>(
+      (provider) => provider.account?.describable.name,
+    );
+    final accountAvatar = context.select<AccountProvider, String?>(
+      (provider) => provider.account?.avatarUrl,
+    );
+    final resolvedUserName = userName ?? accountName;
+    final resolvedAvatarUrl = avatarUrl ?? accountAvatar;
+
    final menuItems = items ??
      <PayoutDestination>[
      PayoutDestination.dashboard,
@@ -42,16 +55,16 @@ class PayoutSidebar extends StatelessWidget {
      children: [
        UserProfileCard(
          theme: theme, 
-          avatarUrl: avatarUrl, 
-          userName: userName, 
+          avatarUrl: resolvedAvatarUrl, 
+          userName: resolvedUserName, 
          selected: selected, 
          onSelected: onSelected
        ),
        const SizedBox(height: 8),
        SideMenuColumn(
          theme: theme,
-          avatarUrl: avatarUrl,
-          userName: userName,
+          avatarUrl: resolvedAvatarUrl,
+          userName: resolvedUserName,
          items: menuItems,
          selected: selected,
          onSelected: onSelected,
--- a/frontend/pweb/pubspec.yaml
+++ b/frontend/pweb/pubspec.yaml
@@ -65,7 +65,7 @@ dependencies:
  flutter_settings_ui: ^3.0.1
  pin_code_fields: ^8.0.1
  fl_chart: ^1.0.0
-  syncfusion_flutter_charts: ^32.1.19
+  syncfusion_flutter_charts: ^31.2.10
  flutter_multi_formatter: ^2.13.7
  dotted_border: ^3.1.0
  qr_flutter: ^4.1.0
Author	SHA1	Message	Date
Arseni	0ecd17d2dc	Updated Settings Page	2025-12-18 15:15:33 +03:00
tech	d649748f6f	Merge pull request 'server endpoint' (#115 ) from quotes-115 into main All checks were successful ci/woodpecker/push/bff Pipeline was successful Details ci/woodpecker/push/fx_oracle Pipeline was successful Details ci/woodpecker/push/ledger Pipeline was successful Details ci/woodpecker/push/nats Pipeline was successful Details ci/woodpecker/push/mntx_gateway Pipeline was successful Details ci/woodpecker/push/billing_fees Pipeline was successful Details ci/woodpecker/push/db Pipeline was successful Details ci/woodpecker/push/chain_gateway Pipeline was successful Details ci/woodpecker/push/fx_ingestor Pipeline was successful Details ci/woodpecker/push/frontend Pipeline was successful Details ci/woodpecker/push/payments_orchestrator Pipeline was successful Details ci/woodpecker/push/notification Pipeline was successful Details Reviewed-on: #115	2025-12-17 17:15:40 +00:00
Stephan D	61177a4e30	server endpoint	2025-12-17 18:15:02 +01:00