Updated Settings Page

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

@@ -5,7 +5,9 @@ import (
 	"time"
 
 	"github.com/tech/sendico/payments/orchestrator/storage/model"
+	"github.com/tech/sendico/pkg/merrors"
 	fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1"
+	paginationv1 "github.com/tech/sendico/pkg/proto/common/pagination/v1"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1"
 	orchestratorv1 "github.com/tech/sendico/pkg/proto/payments/orchestrator/v1"
@@ -411,3 +413,74 @@ func cloneNetworkEstimate(resp *chainv1.EstimateTransferFeeResponse) *chainv1.Es
 	}
 	return nil
 }
+
+func protoFailureToModel(code orchestratorv1.PaymentFailureCode) model.PaymentFailureCode {
+	switch code {
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_BALANCE:
+		return model.PaymentFailureCodeBalance
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_LEDGER:
+		return model.PaymentFailureCodeLedger
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_FX:
+		return model.PaymentFailureCodeFX
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_CHAIN:
+		return model.PaymentFailureCodeChain
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_FEES:
+		return model.PaymentFailureCodeFees
+	case orchestratorv1.PaymentFailureCode_PAYMENT_FAILURE_CODE_POLICY:
+		return model.PaymentFailureCodePolicy
+	default:
+		return model.PaymentFailureCodeUnspecified
+	}
+}
+
+func applyProtoPaymentToModel(src *orchestratorv1.Payment, dst *model.Payment) error {
+	if src == nil || dst == nil {
+		return merrors.InvalidArgument("payment payload is required")
+	}
+	dst.PaymentRef = strings.TrimSpace(src.GetPaymentRef())
+	dst.IdempotencyKey = strings.TrimSpace(src.GetIdempotencyKey())
+	dst.Intent = intentFromProto(src.GetIntent())
+	dst.State = modelStateFromProto(src.GetState())
+	dst.FailureCode = protoFailureToModel(src.GetFailureCode())
+	dst.FailureReason = strings.TrimSpace(src.GetFailureReason())
+	dst.Metadata = cloneMetadata(src.GetMetadata())
+	dst.LastQuote = quoteSnapshotToModel(src.GetLastQuote())
+	dst.Execution = executionFromProto(src.GetExecution())
+	if src.GetCardPayout() != nil {
+		dst.CardPayout = &model.CardPayout{
+			PayoutRef:         strings.TrimSpace(src.GetCardPayout().GetPayoutRef()),
+			ProviderPaymentID: strings.TrimSpace(src.GetCardPayout().GetProviderPaymentId()),
+			Status:            strings.TrimSpace(src.GetCardPayout().GetStatus()),
+			FailureReason:     strings.TrimSpace(src.GetCardPayout().GetFailureReason()),
+			CardCountry:       strings.TrimSpace(src.GetCardPayout().GetCardCountry()),
+			MaskedPan:         strings.TrimSpace(src.GetCardPayout().GetMaskedPan()),
+			ProviderCode:      strings.TrimSpace(src.GetCardPayout().GetProviderCode()),
+			GatewayReference:  strings.TrimSpace(src.GetCardPayout().GetGatewayReference()),
+		}
+	}
+	return nil
+}
+
+func executionFromProto(src *orchestratorv1.ExecutionRefs) *model.ExecutionRefs {
+	if src == nil {
+		return nil
+	}
+	return &model.ExecutionRefs{
+		DebitEntryRef:    strings.TrimSpace(src.GetDebitEntryRef()),
+		CreditEntryRef:   strings.TrimSpace(src.GetCreditEntryRef()),
+		FXEntryRef:       strings.TrimSpace(src.GetFxEntryRef()),
+		ChainTransferRef: strings.TrimSpace(src.GetChainTransferRef()),
+		CardPayoutRef:    strings.TrimSpace(src.GetCardPayoutRef()),
+		FeeTransferRef:   strings.TrimSpace(src.GetFeeTransferRef()),
+	}
+}
+
+func ensurePageRequest(req *orchestratorv1.ListPaymentsRequest) *paginationv1.CursorPageRequest {
+	if req == nil {
+		return &paginationv1.CursorPageRequest{}
+	}
+	if req.GetPage() == nil {
+		return &paginationv1.CursorPageRequest{}
+	}
+	return req.GetPage()
+}

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

@@ -214,6 +214,20 @@ func decimalFromMoney(m *moneyv1.Money) (decimal.Decimal, error) {
 	return decimal.NewFromString(m.GetAmount())
 }
 
+func decimalFromMoneyMatching(reference, candidate *moneyv1.Money) (*decimal.Decimal, error) {
+	if reference == nil || candidate == nil {
+		return nil, nil
+	}
+	if !strings.EqualFold(reference.GetCurrency(), candidate.GetCurrency()) {
+		return nil, nil
+	}
+	value, err := decimal.NewFromString(candidate.GetAmount())
+	if err != nil {
+		return nil, err
+	}
+	return &value, nil
+}
+
 func makeMoney(currency string, value decimal.Decimal) *moneyv1.Money {
 	return &moneyv1.Money{
 		Currency: currency,

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

@@ -57,7 +57,7 @@ func TestMinQuoteExpiry(t *testing.T) {
 	later := now.Add(10 * time.Minute)
 	earliest := now.Add(5 * time.Minute)
 
-	min, ok := minQuoteExpiry([]time.Time{later, {}, earliest})
+	min, ok := minQuoteExpiry([]time.Time{later, time.Time{}, earliest})
 	if !ok {
 		t.Fatal("expected min expiry to be set")
 	}
@@ -65,7 +65,7 @@ func TestMinQuoteExpiry(t *testing.T) {
 		t.Fatalf("expected min expiry %v, got %v", earliest, min)
 	}
 
-	if _, ok := minQuoteExpiry([]time.Time{{}}); ok {
+	if _, ok := minQuoteExpiry([]time.Time{time.Time{}}); ok {
 		t.Fatal("expected min expiry to be unset")
 	}
 }

frontend/pshared/lib/api/requests/payment/quotes.dart

@@ -1,25 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-import 'package:pshared/api/requests/payment/base.dart';
-import 'package:pshared/data/dto/payment/intent/payment.dart';
-
-part 'quotes.g.dart';
-
-
-@JsonSerializable()
-class QuotePaymentsRequest extends PaymentBaseRequest {
-  final List<PaymentIntentDTO> intents;
-
-  @JsonKey(defaultValue: false)
-  final bool previewOnly;
-
-  const QuotePaymentsRequest({
-    required super.idempotencyKey,
-    super.metadata,
-    required this.intents,
-    this.previewOnly = false,
-  });
-
-  factory QuotePaymentsRequest.fromJson(Map<String, dynamic> json) => _$QuotePaymentsRequestFromJson(json);
-  @override
-  Map<String, dynamic> toJson() => _$QuotePaymentsRequestToJson(this);
-}

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);
+} 

frontend/pshared/lib/api/responses/payment/quotes.dart

@@ -1,20 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import 'package:pshared/api/responses/base.dart';
-import 'package:pshared/api/responses/token.dart';
-import 'package:pshared/data/dto/payment/quotes.dart';
-
-part 'quotes.g.dart';
-
-
-@JsonSerializable(explicitToJson: true)
-class PaymentQuotesResponse extends BaseAuthorizedResponse {
-
-  final PaymentQuotesDTO quote;
-
-  const PaymentQuotesResponse({required super.accessToken, required this.quote});
-
-  factory PaymentQuotesResponse.fromJson(Map<String, dynamic> json) => _$PaymentQuotesResponseFromJson(json);
-  @override
-  Map<String, dynamic> toJson() => _$PaymentQuotesResponseToJson(this);
-}

frontend/pshared/lib/data/dto/payment/quote_aggregate.dart

@@ -1,24 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import 'package:pshared/data/dto/payment/money.dart';
-
-part 'quote_aggregate.g.dart';
-
-
-@JsonSerializable()
-class PaymentQuoteAggregateDTO {
-  final List<MoneyDTO>? debitAmounts;
-  final List<MoneyDTO>? expectedSettlementAmounts;
-  final List<MoneyDTO>? expectedFeeTotals;
-  final List<MoneyDTO>? networkFeeTotals;
-
-  const PaymentQuoteAggregateDTO({
-    this.debitAmounts,
-    this.expectedSettlementAmounts,
-    this.expectedFeeTotals,
-    this.networkFeeTotals,
-  });
-
-  factory PaymentQuoteAggregateDTO.fromJson(Map<String, dynamic> json) => _$PaymentQuoteAggregateDTOFromJson(json);
-  Map<String, dynamic> toJson() => _$PaymentQuoteAggregateDTOToJson(this);
-}

frontend/pshared/lib/data/dto/payment/quotes.dart

@@ -1,23 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import 'package:pshared/data/dto/payment/quote_aggregate.dart';
-import 'package:pshared/data/dto/payment/payment_quote.dart';
-
-part 'quotes.g.dart';
-
-
-@JsonSerializable()
-class PaymentQuotesDTO {
-  final String quoteRef;
-  final PaymentQuoteAggregateDTO? aggregate;
-  final List<PaymentQuoteDTO>? quotes;
-
-  const PaymentQuotesDTO({
-    required this.quoteRef,
-    this.aggregate,
-    this.quotes,
-  });
-
-  factory PaymentQuotesDTO.fromJson(Map<String, dynamic> json) => _$PaymentQuotesDTOFromJson(json);
-  Map<String, dynamic> toJson() => _$PaymentQuotesDTOToJson(this);
-}

frontend/pshared/lib/data/mapper/payment/quote_aggregate.dart

@@ -1,22 +0,0 @@
-import 'package:pshared/data/dto/payment/quote_aggregate.dart';
-import 'package:pshared/data/mapper/payment/money.dart';
-import 'package:pshared/models/payment/quote_aggregate.dart';
-
-
-extension PaymentQuoteAggregateDTOMapper on PaymentQuoteAggregateDTO {
-  PaymentQuoteAggregate toDomain() => PaymentQuoteAggregate(
-    debitAmounts: debitAmounts?.map((amount) => amount.toDomain()).toList(),
-    expectedSettlementAmounts: expectedSettlementAmounts?.map((amount) => amount.toDomain()).toList(),
-    expectedFeeTotals: expectedFeeTotals?.map((amount) => amount.toDomain()).toList(),
-    networkFeeTotals: networkFeeTotals?.map((amount) => amount.toDomain()).toList(),
-  );
-}
-
-extension PaymentQuoteAggregateMapper on PaymentQuoteAggregate {
-  PaymentQuoteAggregateDTO toDTO() => PaymentQuoteAggregateDTO(
-    debitAmounts: debitAmounts?.map((amount) => amount.toDTO()).toList(),
-    expectedSettlementAmounts: expectedSettlementAmounts?.map((amount) => amount.toDTO()).toList(),
-    expectedFeeTotals: expectedFeeTotals?.map((amount) => amount.toDTO()).toList(),
-    networkFeeTotals: networkFeeTotals?.map((amount) => amount.toDTO()).toList(),
-  );
-}

frontend/pshared/lib/data/mapper/payment/quotes.dart

@@ -1,21 +0,0 @@
-import 'package:pshared/data/dto/payment/quotes.dart';
-import 'package:pshared/data/mapper/payment/payment_quote.dart';
-import 'package:pshared/data/mapper/payment/quote_aggregate.dart';
-import 'package:pshared/models/payment/quotes.dart';
-
-
-extension PaymentQuotesDTOMapper on PaymentQuotesDTO {
-  PaymentQuotes toDomain() => PaymentQuotes(
-    quoteRef: quoteRef,
-    aggregate: aggregate?.toDomain(),
-    quotes: quotes?.map((quote) => quote.toDomain()).toList(),
-  );
-}
-
-extension PaymentQuotesMapper on PaymentQuotes {
-  PaymentQuotesDTO toDTO() => PaymentQuotesDTO(
-    quoteRef: quoteRef,
-    aggregate: aggregate?.toDTO(),
-    quotes: quotes?.map((quote) => quote.toDTO()).toList(),
-  );
-}

frontend/pshared/lib/models/payment/quote_aggregate.dart

@@ -1,16 +0,0 @@
-import 'package:pshared/models/payment/money.dart';
-
-
-class PaymentQuoteAggregate {
-  final List<Money>? debitAmounts;
-  final List<Money>? expectedSettlementAmounts;
-  final List<Money>? expectedFeeTotals;
-  final List<Money>? networkFeeTotals;
-
-  const PaymentQuoteAggregate({
-    required this.debitAmounts,
-    required this.expectedSettlementAmounts,
-    required this.expectedFeeTotals,
-    required this.networkFeeTotals,
-  });
-}

frontend/pshared/lib/models/payment/quotes.dart

@@ -1,15 +0,0 @@
-import 'package:pshared/models/payment/quote.dart';
-import 'package:pshared/models/payment/quote_aggregate.dart';
-
-
-class PaymentQuotes {
-  final String quoteRef;
-  final PaymentQuoteAggregate? aggregate;
-  final List<PaymentQuote>? quotes;
-
-  const PaymentQuotes({
-    required this.quoteRef,
-    required this.aggregate,
-    required this.quotes,
-  });
-}

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 {

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(

frontend/pshared/lib/service/payment/quotation.dart

@@ -1,13 +1,9 @@
 import 'package:logging/logging.dart';
 
 import 'package:pshared/api/requests/payment/quote.dart';
-import 'package:pshared/api/requests/payment/quotes.dart';
 import 'package:pshared/api/responses/payment/quotation.dart';
-import 'package:pshared/api/responses/payment/quotes.dart';
 import 'package:pshared/data/mapper/payment/payment_quote.dart';
-import 'package:pshared/data/mapper/payment/quotes.dart';
 import 'package:pshared/models/payment/quote.dart';
-import 'package:pshared/models/payment/quotes.dart';
 import 'package:pshared/service/authorization/service.dart';
 import 'package:pshared/service/services.dart';
 
@@ -25,14 +21,4 @@ class QuotationService {
     );
     return PaymentQuoteResponse.fromJson(response).quote.toDomain();
   }
-
-  static Future<PaymentQuotes> getMultipleQuotation(String organizationRef, QuotePaymentsRequest request) async {
-    _logger.fine('Quoting payments for organization $organizationRef');
-    final response = await AuthorizationService.getPOSTResponse(
-      _objectType,
-      '/quote-multiple/$organizationRef',
-      request.toJson(),
-    );
-    return PaymentQuotesResponse.fromJson(response).quote.toDomain();
-  }
 }

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",

frontend/pweb/lib/l10n/ru.arb

@@ -9,7 +9,13 @@
   "usernameErrorInvalid": "Укажите действительный адрес электронной почты",
   "usernameUnknownTLD": "Домен .{domain} неизвестен, пожалуйста, проверьте его",
   "password": "Пароль",
+  "oldPassword": "Текущий пароль",
+  "newPassword": "Новый пароль",
   "confirmPassword": "Подтвердите пароль",
+  "changePassword": "Изменить пароль",
+  "savePassword": "Сохранить пароль",
+  "changePasswordSuccess": "Пароль обновлен",
+  "changePasswordError": "Не удалось обновить пароль",
   "passwordValidationRuleDigit": "содержит цифру",
   "passwordValidationRuleUpperCase": "содержит заглавную букву",
   "passwordValidationRuleLowerCase": "содержит строчную букву",

frontend/pweb/lib/models/edit_state.dart

@@ -0,0 +1 @@
+enum EditState { view, edit, saving }

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,86 +47,131 @@ 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;
+      _editState = EditState.saving;
-      _isEditing = false;
+      _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 Column(
+    return Consumer<AccountProvider>(
-      mainAxisSize: MainAxisSize.min,
+      builder: (context, provider, _) {
-      children: [
+        final isEditing = _editState != EditState.view;
-        Row(
+        final currentName = provider.account?.name ?? _originalName;
-          mainAxisAlignment: MainAxisAlignment.center,
+        final isBusy = provider.isLoading || _editState == EditState.saving;
+
+        if (!isEditing && currentName != _originalName) {
+          _originalName = currentName;
+          _controller.text = currentName;
+        }
+
+        return Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
-            if (_isEditing)
+            Row(
-              SizedBox(
+              mainAxisAlignment: MainAxisAlignment.center,
-                width: _inputWidth,
+              children: [
-                child: TextFormField(
+                if (isEditing)
-                  controller: _controller,
+                  SizedBox(
-                  style: theme.textTheme.headlineMedium?.copyWith(
+                    width: _inputWidth,
-                    fontWeight: FontWeight.bold,
+                    child: TextFormField(
-                  ),
+                      controller: _controller,
-                  autofocus: true,
+                      style: theme.textTheme.headlineMedium?.copyWith(
-                  decoration: InputDecoration(
+                        fontWeight: FontWeight.bold,
-                    hintText: widget.hintText,
+                      ),
-                    isDense: true,
+                      autofocus: true,
-                    border: UnderlineInputBorder(
+                      enabled: !isBusy,
-                      borderSide: BorderSide(
+                      decoration: InputDecoration(
-                        color: theme.colorScheme.primary,
+                        hintText: widget.hintText,
-                        width: _borderWidth,
+                        isDense: true,
+                        border: UnderlineInputBorder(
+                          borderSide: BorderSide(
+                            color: theme.colorScheme.primary,
+                            width: _borderWidth,
+                          ),
+                        ),
                       ),
                     ),
+                  )
+                else
+                  Text(
+                    _originalName,
+                    style: theme.textTheme.headlineMedium?.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
                   ),
-                ),
+                const SizedBox(width: _spacing),
-              )
+                if (isEditing) ...[
-            else
+                  IconButton(
+                    icon: Icon(Icons.check, color: theme.colorScheme.primary),
+                    onPressed: isBusy ? null : () => _saveEditing(provider),
+                  ),
+                  IconButton(
+                    icon: Icon(Icons.close, color: theme.colorScheme.error),
+                    onPressed: isBusy ? null : _cancelEditing,
+                  ),
+                ] else
+                  IconButton(
+                    icon: Icon(Icons.edit, color: theme.colorScheme.primary),
+                    onPressed: isBusy ? null : _startEditing,
+                  ),
+              ],
+            ),
+            const SizedBox(height: _errorSpacing),
+            if (_errorText.isNotEmpty)
               Text(
-                _originalName,
+                _errorText,
-                style: theme.textTheme.headlineMedium?.copyWith(
+                style: theme.textTheme.bodySmall?.copyWith(
-                  fontWeight: FontWeight.bold,
+                  color: theme.colorScheme.error,
                 ),
               ),
-            const SizedBox(width: _spacing),
-            if (_isEditing) ...[
-              IconButton(
-                icon: Icon(Icons.check, color: theme.colorScheme.primary), 
-                onPressed: _saveEditing,
-              ),
-              IconButton(
-                icon: Icon(Icons.close, color: theme.colorScheme.error),
-                onPressed: _cancelEditing,
-              ),
-            ] else
-              IconButton(
-                icon: Icon(Icons.edit, color: theme.colorScheme.primary),
-                onPressed: _startEditing,
-              ),
           ],
-        ),
+        );
-        const SizedBox(height: _errorSpacing),
+      },
-        if (widget.errorText.isEmpty)
-          Text(
-            widget.errorText,
-            style: theme.textTheme.bodySmall?.copyWith(
-              color: theme.colorScheme.error,
-            ),
-          ),
-      ],
     );
   }
 }

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,
+                  ),
+                ),
+              ],
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}

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),
+                      ),
+                    ],
+                  ],
+                ),
+              ),
+            ],
+          ],
+        );
+      },
+    );
+  }
+}

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),
+    );
+  }
+}

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,34 +23,48 @@ 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(
-      elevation: 4,
+      alignment: Alignment.topCenter,
-      borderRadius: BorderRadius.circular(_cardRadius),
+      child: Material(
-      clipBehavior: Clip.antiAlias,
+        elevation: 4,
-      color: theme.colorScheme.onSecondary,
+        borderRadius: BorderRadius.circular(_cardRadius),
-      child: Padding(
+        color: theme.colorScheme.onSecondary,
-        padding: _cardPadding,
+        child: Padding(
-        child: Column(
+          padding: _cardPadding,
-          mainAxisSize: MainAxisSize.min,
+          child: Column(
-          spacing: _itemSpacing,
+            mainAxisSize: MainAxisSize.min,
-          children: [
+            spacing: _itemSpacing,
-            AvatarTile(
+            children: [
-              avatarUrl: 'https://avatars.githubusercontent.com/u/65651201',
+              AvatarTile(
-              title: loc.avatar,
+                avatarUrl: 'https://avatars.githubusercontent.com/u/65651201',
-              description: loc.avatarHint,
+                title: loc.avatar,
-              errorText: loc.avatarUpdateError,
+                description: loc.avatarHint,
-            ),
+                errorText: loc.avatarUpdateError,
-            AccountName(
+              ),
-              name: loc.userNamePlaceholder,
+              AccountName(
-              title: loc.accountName,
+                name: accountName ?? loc.userNamePlaceholder,
-              hintText: loc.accountNameHint,
+                title: loc.accountName,
-              errorText: loc.accountNameUpdateError,
+                hintText: loc.accountNameHint,
-            ),
+                errorText: loc.accountNameUpdateError,
-            LocalePicker(
+              ),
-              title: loc.language,
+              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,
+              ),
+            ],
+          ),
         ),
       ),
     );

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;
+  EditState _state = EditState.view;
-  bool get _isSaving => _state == _EditState.saving;
+  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);
       },
     );
   }

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();
+  }
+}

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, 
+          avatarUrl: resolvedAvatarUrl, 
-          userName: userName, 
+          userName: resolvedUserName, 
           selected: selected, 
           onSelected: onSelected
         ),
         const SizedBox(height: 8),
         SideMenuColumn(
           theme: theme,
-          avatarUrl: avatarUrl,
+          avatarUrl: resolvedAvatarUrl,
-          userName: userName,
+          userName: resolvedUserName,
           items: menuItems,
           selected: selected,
           onSelected: onSelected,

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