Reuploading fixed qoutation

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

@@ -160,16 +160,20 @@ String insufficientNetPolicyToValue(InsufficientNetPolicy policy) {
 PaymentType endpointTypeFromValue(String? value) {
   switch (value) {
     case 'managedWallet':
+    case 'managed_wallet':
       return PaymentType.managedWallet;
     case 'externalChain':
+    case 'external_chain':
       return PaymentType.externalChain;
     case 'card':
       return PaymentType.card;
     case 'cardToken':
+    case 'card_token':
       return PaymentType.cardToken;
     case 'ledger':
       return PaymentType.ledger;
     case 'bankAccount':
+    case 'bank_account':
       return PaymentType.bankAccount;
     case 'iban':
       return PaymentType.iban;
@@ -185,15 +189,15 @@ String endpointTypeToValue(PaymentType type) {
     case PaymentType.ledger:
       return 'ledger';
     case PaymentType.managedWallet:
-      return 'managedWallet';
+      return 'managed_wallet';
     case PaymentType.externalChain:
-      return 'externalChain';
+      return 'external_chain';
     case PaymentType.card:
       return 'card';
     case PaymentType.cardToken:
-      return 'cardToken';
+      return 'card';
     case PaymentType.bankAccount:
-      return 'bankAccount';
+      return 'bank_account';
     case PaymentType.iban:
       return 'iban';
     case PaymentType.wallet:

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

@@ -5,6 +5,7 @@ import 'package:pshared/data/dto/payment/external_chain.dart';
 import 'package:pshared/data/dto/payment/ledger.dart';
 import 'package:pshared/data/dto/payment/managed_wallet.dart';
 import 'package:pshared/data/mapper/payment/asset.dart';
+import 'package:pshared/data/mapper/payment/enums.dart';
 import 'package:pshared/data/mapper/payment/type.dart';
 import 'package:pshared/models/payment/methods/card.dart';
 import 'package:pshared/models/payment/methods/card_token.dart';
@@ -23,7 +24,7 @@ extension PaymentMethodDataEndpointMapper on PaymentMethodData {
       case PaymentType.ledger:
         final payload = this as LedgerPaymentMethod;
         return PaymentEndpointDTO(
-          type: paymentTypeToValue(type),
+          type: endpointTypeToValue(type),
           data: LedgerEndpointDTO(
             ledgerAccountRef: payload.ledgerAccountRef,
             contraLedgerAccountRef: payload.contraLedgerAccountRef,
@@ -33,7 +34,7 @@ extension PaymentMethodDataEndpointMapper on PaymentMethodData {
       case PaymentType.managedWallet:
         final payload = this as ManagedWalletPaymentMethod;
         return PaymentEndpointDTO(
-          type: paymentTypeToValue(type),
+          type: endpointTypeToValue(type),
           data: ManagedWalletEndpointDTO(
             managedWalletRef: payload.managedWalletRef,
             asset: payload.asset?.toDTO(),
@@ -43,7 +44,7 @@ extension PaymentMethodDataEndpointMapper on PaymentMethodData {
       case PaymentType.externalChain:
         final payload = this as CryptoAddressPaymentMethod;
         return PaymentEndpointDTO(
-          type: paymentTypeToValue(type),
+          type: endpointTypeToValue(type),
           data: ExternalChainEndpointDTO(
             asset: payload.asset?.toDTO(),
             address: payload.address,
@@ -54,7 +55,7 @@ extension PaymentMethodDataEndpointMapper on PaymentMethodData {
       case PaymentType.card:
         final payload = this as CardPaymentMethod;
         return PaymentEndpointDTO(
-          type: paymentTypeToValue(type),
+          type: endpointTypeToValue(type),
           data: CardEndpointDTO(
             pan: payload.pan,
             expMonth: payload.expMonth,
@@ -68,7 +69,7 @@ extension PaymentMethodDataEndpointMapper on PaymentMethodData {
       case PaymentType.cardToken:
         final payload = this as CardTokenPaymentMethod;
         return PaymentEndpointDTO(
-          type: paymentTypeToValue(type),
+          type: endpointTypeToValue(type),
           data: CardTokenEndpointDTO(
             token: payload.token,
             maskedPan: payload.maskedPan,
@@ -85,7 +86,7 @@ extension PaymentEndpointDTOMapper on PaymentEndpointDTO {
   PaymentMethodData toDomain() {
     final metadata = this.metadata;
 
-    switch (paymentTypeFromValue(type)) {
+    switch (_resolveEndpointType(type, data)) {
       case PaymentType.ledger:
         final payload = LedgerEndpointDTO.fromJson(data);
         return LedgerPaymentMethod(
@@ -131,3 +132,10 @@ extension PaymentEndpointDTOMapper on PaymentEndpointDTO {
     }
   }
 }
+
+PaymentType _resolveEndpointType(String type, Map<String, dynamic> data) {
+  if (type == 'card' && (data.containsKey('token') || data.containsKey('masked_pan'))) {
+    return PaymentType.cardToken;
+  }
+  return endpointTypeFromValue(type);
+}

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

@@ -3,7 +3,7 @@ import 'package:pshared/data/mapper/payment/fee_line.dart';
 import 'package:pshared/data/mapper/payment/fx_quote.dart';
 import 'package:pshared/data/mapper/payment/money.dart';
 import 'package:pshared/data/mapper/payment/network_fee.dart';
-import 'package:pshared/models/payment/quote.dart';
+import 'package:pshared/models/payment/quote/quote.dart';
 
 
 extension PaymentQuoteDTOMapper on PaymentQuoteDTO {

frontend/pshared/lib/data/mapper/payment/quote/aggregate.dart

@@ -1,6 +1,6 @@
 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';
+import 'package:pshared/models/payment/quote/aggregate.dart';
 
 
 extension PaymentQuoteAggregateDTOMapper on PaymentQuoteAggregateDTO {

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

@@ -1,7 +1,7 @@
 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';
+import 'package:pshared/data/mapper/payment/quote/aggregate.dart';
+import 'package:pshared/models/payment/quote/quotes.dart';
 
 
 extension PaymentQuotesDTOMapper on PaymentQuotesDTO {

frontend/pshared/lib/models/auto_refresh_mode.dart

@@ -0,0 +1 @@
+enum AutoRefreshMode { off, on }

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

@@ -1,4 +1,4 @@
-import 'package:pshared/models/payment/quote.dart';
+import 'package:pshared/models/payment/quote/quote.dart';
 
 
 class Payment {

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

@@ -1,5 +1,5 @@
-import 'package:pshared/models/payment/quote.dart';
-import 'package:pshared/models/payment/quote_aggregate.dart';
+import 'package:pshared/models/payment/quote/quote.dart';
+import 'package:pshared/models/payment/quote/aggregate.dart';
 
 
 class PaymentQuotes {

frontend/pshared/lib/models/payment/quote/status_type.dart

@@ -0,0 +1 @@
+enum QuoteStatusType { loading, error, missing, expired, active }

frontend/pshared/lib/provider/payment/provider.dart

@@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart';
 
 import 'package:pshared/models/payment/payment.dart';
 import 'package:pshared/provider/organizations.dart';
-import 'package:pshared/provider/payment/quotation.dart';
+import 'package:pshared/provider/payment/quotation/quotation.dart';
 import 'package:pshared/provider/resource.dart';
 import 'package:pshared/service/payment/service.dart';
 
@@ -31,7 +31,7 @@ class PaymentProvider extends ChangeNotifier {
 
   Future<Payment?> pay({String? idempotencyKey, Map<String, String>? metadata}) async {
     if (!_organization.isOrganizationSet) throw StateError('Organization is not set');
-    if (!_quotation.isReady) throw StateError('Quotation is not ready');
+    if (!_quotation.hasLiveQuote) throw StateError('Quotation is not ready');
     final quoteRef = _quotation.quotation?.quoteRef;
     if (quoteRef == null || quoteRef.isEmpty) {
       throw StateError('Quotation reference is not set');

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

@@ -1,199 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:collection/collection.dart';
-
-import 'package:uuid/uuid.dart';
-
-import 'package:pshared/api/requests/payment/quote.dart';
-import 'package:pshared/data/mapper/payment/intent/payment.dart';
-import 'package:pshared/models/asset.dart';
-import 'package:pshared/models/payment/currency_pair.dart';
-import 'package:pshared/models/payment/customer.dart';
-import 'package:pshared/models/payment/fx/intent.dart';
-import 'package:pshared/models/payment/fx/side.dart';
-import 'package:pshared/models/payment/kind.dart';
-import 'package:pshared/models/payment/methods/managed_wallet.dart';
-import 'package:pshared/models/payment/methods/type.dart';
-import 'package:pshared/models/payment/money.dart';
-import 'package:pshared/models/payment/settlement_mode.dart';
-import 'package:pshared/models/payment/intent.dart';
-import 'package:pshared/models/payment/quote.dart';
-import 'package:pshared/models/recipient/recipient.dart';
-import 'package:pshared/provider/organizations.dart';
-import 'package:pshared/provider/payment/amount.dart';
-import 'package:pshared/provider/payment/flow.dart';
-import 'package:pshared/provider/payment/wallets.dart';
-import 'package:pshared/provider/recipient/provider.dart';
-import 'package:pshared/provider/recipient/pmethods.dart';
-import 'package:pshared/provider/resource.dart';
-import 'package:pshared/service/payment/quotation.dart';
-import 'package:pshared/utils/currency.dart';
-
-
-class QuotationProvider extends ChangeNotifier {
-  Resource<PaymentQuote> _quotation = Resource(data: null, isLoading: false, error: null);
-  late OrganizationsProvider _organizations;
-  bool _isLoaded = false;
-
-  void update(
-    OrganizationsProvider venue, 
-    PaymentAmountProvider payment,
-    WalletsProvider wallets,
-    PaymentFlowProvider flow,
-    RecipientsProvider recipients,
-    PaymentMethodsProvider methods,
-  ) {
-    _organizations = venue;
-    final t = flow.selectedType;
-    final method = methods.methods.firstWhereOrNull((m) => m.type == t);
-    if ((wallets.selectedWallet != null) && (method != null)) {
-      final customer = _buildCustomer(
-        recipient: recipients.currentObject,
-        method: method,
-      );
-      final amount = Money(
-        amount: payment.amount.toString(),
-        // TODO: adapt to possible other sources
-        currency: currencyCodeToString(wallets.selectedWallet!.currency),
-      );
-      final fxIntent = FxIntent(
-        pair: CurrencyPair(
-          base: currencyCodeToString(wallets.selectedWallet!.currency),
-          quote: 'RUB', // TODO: exentd target currencies
-        ),
-        side: FxSide.sellBaseBuyQuote,
-      );
-      getQuotation(PaymentIntent(
-        kind: PaymentKind.payout,
-        amount: amount,
-        destination: method.data,
-        source: ManagedWalletPaymentMethod(
-          managedWalletRef: wallets.selectedWallet!.id,
-        ),
-        fx: fxIntent,
-        settlementMode: payment.payerCoversFee ? SettlementMode.fixReceived : SettlementMode.fixSource,
-        settlementCurrency: _resolveSettlementCurrency(amount: amount, fx: fxIntent),
-        customer: customer,
-      ));
-    }
-  }
-
-  PaymentQuote? get quotation => _quotation.data;
-
-  bool get isReady => _isLoaded && !_quotation.isLoading && _quotation.error == null;
-
-  Asset? get fee => quotation == null ? null : createAsset(quotation!.expectedFeeTotal!.currency, quotation!.expectedFeeTotal!.amount);
-  Asset? get total => quotation == null ? null : createAsset(quotation!.debitAmount!.currency, quotation!.debitAmount!.amount);
-  Asset? get recipientGets => quotation == null ? null : createAsset(quotation!.expectedSettlementAmount!.currency, quotation!.expectedSettlementAmount!.amount);
-
-  String _resolveSettlementCurrency({
-    required Money amount,
-    required FxIntent? fx,
-  }) {
-    final pair = fx?.pair;
-    if (pair != null) {
-      switch (fx?.side ?? FxSide.unspecified) {
-        case FxSide.buyBaseSellQuote:
-          if (pair.base.isNotEmpty) return pair.base;
-          break;
-        case FxSide.sellBaseBuyQuote:
-          if (pair.quote.isNotEmpty) return pair.quote;
-          break;
-        case FxSide.unspecified:
-          break;
-      }
-      if (amount.currency == pair.base && pair.quote.isNotEmpty) return pair.quote;
-      if (amount.currency == pair.quote && pair.base.isNotEmpty) return pair.base;
-      if (pair.quote.isNotEmpty) return pair.quote;
-      if (pair.base.isNotEmpty) return pair.base;
-    }
-    return amount.currency;
-  }
-
-  Customer _buildCustomer({
-    required Recipient? recipient,
-    required PaymentMethod method,
-  }) {
-    final name = _resolveCustomerName(method, recipient);
-    String? firstName;
-    String? middleName;
-    String? lastName;
-
-    if (name != null && name.isNotEmpty) {
-      final parts = name.split(RegExp(r'\s+'));
-      if (parts.length == 1) {
-        firstName = parts.first;
-      } else if (parts.length == 2) {
-        firstName = parts.first;
-        lastName = parts.last;
-      } else {
-        firstName = parts.first;
-        lastName = parts.last;
-        middleName = parts.sublist(1, parts.length - 1).join(' ');
-      }
-    }
-
-    return Customer(
-      id: recipient?.id ?? method.recipientRef,
-      firstName: firstName,
-      middleName: middleName,
-      lastName: lastName,
-      country: method.cardData?.country,
-    );
-  }
-
-  String? _resolveCustomerName(PaymentMethod method, Recipient? recipient) {
-    final card = method.cardData;
-    if (card != null) {
-      return '${card.firstName} ${card.lastName}'.trim();
-    }
-
-    final iban = method.ibanData;
-    if (iban != null && iban.accountHolder.trim().isNotEmpty) {
-      return iban.accountHolder.trim();
-    }
-
-    final bank = method.bankAccountData;
-    if (bank != null && bank.recipientName.trim().isNotEmpty) {
-      return bank.recipientName.trim();
-    }
-
-    final recipientName = recipient?.name.trim();
-    return recipientName?.isNotEmpty == true ? recipientName : null;
-  }
-
-  void _setResource(Resource<PaymentQuote> quotation) {
-    _quotation = quotation;
-    notifyListeners();
-  }
-
-  Future<PaymentQuote?> getQuotation(PaymentIntent intent) async {
-    if (!_organizations.isOrganizationSet) throw StateError('Organization is not set');
-    try {
-      _quotation = _quotation.copyWith(isLoading: true, error: null);
-      final response = await QuotationService.getQuotation(
-        _organizations.current.id, 
-        QuotePaymentRequest(
-          idempotencyKey: Uuid().v4(),
-          intent: intent.toDTO(),
-        ),
-      );
-      _isLoaded = true;
-      _setResource(_quotation.copyWith(data: response, isLoading: false, error: null));
-    } catch (e) {
-      _setResource(_quotation.copyWith(
-        data: null,
-        error: e is Exception ? e : Exception(e.toString()),
-        isLoading: false,
-      ));
-    }
-    notifyListeners();
-    return _quotation.data;
-  }
-
-  void reset() {
-    _setResource(Resource(data: null, isLoading: false, error: null));
-    _isLoaded = false;
-    notifyListeners();
-  }
-}

frontend/pshared/lib/provider/payment/quotation/auto_refresh.dart

@@ -0,0 +1,77 @@
+import 'dart:async';
+
+
+class QuotationAutoRefreshController {
+  bool _enabled = true;
+  Timer? _timer;
+  DateTime? _scheduledAt;
+  DateTime? _triggeredAt;
+
+  bool get isEnabled => _enabled;
+
+  void setEnabled(bool enabled) {
+    if (_enabled == enabled) return;
+    _enabled = enabled;
+  }
+
+  void sync({
+    required bool isLoading,
+    required bool canRefresh,
+    required DateTime? expiresAt,
+    required Future<void> Function() onRefresh,
+  }) {
+    if (!_enabled || isLoading || !canRefresh) {
+      _clearTimer();
+      _scheduledAt = null;
+      _triggeredAt = null;
+      return;
+    }
+
+    if (expiresAt == null) {
+      _clearTimer();
+      _scheduledAt = null;
+      _triggeredAt = null;
+      return;
+    }
+
+    final delay = expiresAt.difference(DateTime.now().toUtc());
+    if (delay <= Duration.zero) {
+      if (_triggeredAt != null && _triggeredAt!.isAtSameMomentAs(expiresAt)) {
+        return;
+      }
+      _triggeredAt = expiresAt;
+      _clearTimer();
+      onRefresh();
+      return;
+    }
+
+    if (_scheduledAt != null &&
+        _scheduledAt!.isAtSameMomentAs(expiresAt) &&
+        _timer?.isActive == true) {
+      return;
+    }
+
+    _triggeredAt = null;
+    _clearTimer();
+    _scheduledAt = expiresAt;
+    _timer = Timer(delay, () {
+      onRefresh();
+    });
+  }
+
+  void reset() {
+    _enabled = false;
+    _scheduledAt = null;
+    _triggeredAt = null;
+    _clearTimer();
+  }
+
+  void dispose() {
+    _clearTimer();
+  }
+
+  void _clearTimer() {
+    _timer?.cancel();
+    _timer = null;
+  }
+}

frontend/pshared/lib/provider/payment/quotation/intent_builder.dart

@@ -0,0 +1,139 @@
+import 'package:collection/collection.dart';
+
+import 'package:pshared/models/payment/currency_pair.dart';
+import 'package:pshared/models/payment/customer.dart';
+import 'package:pshared/models/payment/fx/intent.dart';
+import 'package:pshared/models/payment/fx/side.dart';
+import 'package:pshared/models/payment/kind.dart';
+import 'package:pshared/models/payment/methods/managed_wallet.dart';
+import 'package:pshared/models/payment/methods/type.dart';
+import 'package:pshared/models/payment/money.dart';
+import 'package:pshared/models/payment/settlement_mode.dart';
+import 'package:pshared/models/payment/intent.dart';
+import 'package:pshared/models/recipient/recipient.dart';
+import 'package:pshared/provider/payment/amount.dart';
+import 'package:pshared/provider/payment/flow.dart';
+import 'package:pshared/provider/payment/wallets.dart';
+import 'package:pshared/provider/recipient/provider.dart';
+import 'package:pshared/provider/recipient/pmethods.dart';
+import 'package:pshared/utils/currency.dart';
+
+
+class QuotationIntentBuilder {
+  PaymentIntent? build({
+    required PaymentAmountProvider payment,
+    required WalletsProvider wallets,
+    required PaymentFlowProvider flow,
+    required RecipientsProvider recipients,
+    required PaymentMethodsProvider methods,
+  }) {
+    final selectedWallet = wallets.selectedWallet;
+    final method = methods.methods.firstWhereOrNull((m) => m.type == flow.selectedType);
+    if (selectedWallet == null || method == null) return null;
+
+    final customer = _buildCustomer(
+      recipient: recipients.currentObject,
+      method: method,
+    );
+    final amount = Money(
+      amount: payment.amount.toString(),
+      // TODO: adapt to possible other sources
+      currency: currencyCodeToString(selectedWallet.currency),
+    );
+    final fxIntent = FxIntent(
+      pair: CurrencyPair(
+        base: currencyCodeToString(selectedWallet.currency),
+        quote: 'RUB', // TODO: exentd target currencies
+      ),
+      side: FxSide.sellBaseBuyQuote,
+    );
+    return PaymentIntent(
+      kind: PaymentKind.payout,
+      amount: amount,
+      destination: method.data,
+      source: ManagedWalletPaymentMethod(
+        managedWalletRef: selectedWallet.id,
+      ),
+      fx: fxIntent,
+      settlementMode: payment.payerCoversFee ? SettlementMode.fixReceived : SettlementMode.fixSource,
+      settlementCurrency: _resolveSettlementCurrency(amount: amount, fx: fxIntent),
+      customer: customer,
+    );
+  }
+
+  String _resolveSettlementCurrency({
+    required Money amount,
+    required FxIntent? fx,
+  }) {
+    final pair = fx?.pair;
+    if (pair != null) {
+      switch (fx?.side ?? FxSide.unspecified) {
+        case FxSide.buyBaseSellQuote:
+          if (pair.base.isNotEmpty) return pair.base;
+          break;
+        case FxSide.sellBaseBuyQuote:
+          if (pair.quote.isNotEmpty) return pair.quote;
+          break;
+        case FxSide.unspecified:
+          break;
+      }
+      if (amount.currency == pair.base && pair.quote.isNotEmpty) return pair.quote;
+      if (amount.currency == pair.quote && pair.base.isNotEmpty) return pair.base;
+      if (pair.quote.isNotEmpty) return pair.quote;
+      if (pair.base.isNotEmpty) return pair.base;
+    }
+    return amount.currency;
+  }
+
+  Customer _buildCustomer({
+    required Recipient? recipient,
+    required PaymentMethod method,
+  }) {
+    final name = _resolveCustomerName(method, recipient);
+    String? firstName;
+    String? middleName;
+    String? lastName;
+
+    if (name != null && name.isNotEmpty) {
+      final parts = name.split(RegExp(r'\s+'));
+      if (parts.length == 1) {
+        firstName = parts.first;
+      } else if (parts.length == 2) {
+        firstName = parts.first;
+        lastName = parts.last;
+      } else {
+        firstName = parts.first;
+        lastName = parts.last;
+        middleName = parts.sublist(1, parts.length - 1).join(' ');
+      }
+    }
+
+    return Customer(
+      id: recipient?.id ?? method.recipientRef,
+      firstName: firstName,
+      middleName: middleName,
+      lastName: lastName,
+      country: method.cardData?.country,
+    );
+  }
+
+  String? _resolveCustomerName(PaymentMethod method, Recipient? recipient) {
+    final card = method.cardData;
+    if (card != null) {
+      return '${card.firstName} ${card.lastName}'.trim();
+    }
+
+    final iban = method.ibanData;
+    if (iban != null && iban.accountHolder.trim().isNotEmpty) {
+      return iban.accountHolder.trim();
+    }
+
+    final bank = method.bankAccountData;
+    if (bank != null && bank.recipientName.trim().isNotEmpty) {
+      return bank.recipientName.trim();
+    }
+
+    final recipientName = recipient?.name.trim();
+    return recipientName?.isNotEmpty == true ? recipientName : null;
+  }
+}

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

@@ -0,0 +1,175 @@
+import 'package:flutter/foundation.dart';
+
+import 'package:logging/logging.dart';
+import 'package:collection/collection.dart';
+
+import 'package:uuid/uuid.dart';
+
+import 'package:pshared/api/requests/payment/quote.dart';
+import 'package:pshared/data/mapper/payment/intent/payment.dart';
+import 'package:pshared/models/asset.dart';
+import 'package:pshared/models/payment/quote/status_type.dart';
+import 'package:pshared/models/payment/intent.dart';
+import 'package:pshared/models/payment/quote/quote.dart';
+import 'package:pshared/models/payment/money.dart';
+import 'package:pshared/models/auto_refresh_mode.dart';
+import 'package:pshared/provider/organizations.dart';
+import 'package:pshared/provider/payment/amount.dart';
+import 'package:pshared/provider/payment/flow.dart';
+import 'package:pshared/provider/payment/wallets.dart';
+import 'package:pshared/provider/recipient/provider.dart';
+import 'package:pshared/provider/recipient/pmethods.dart';
+import 'package:pshared/provider/resource.dart';
+import 'package:pshared/provider/payment/quotation/auto_refresh.dart';
+import 'package:pshared/provider/payment/quotation/intent_builder.dart';
+import 'package:pshared/service/payment/quotation.dart';
+
+
+class QuotationProvider extends ChangeNotifier {
+  static final _logger = Logger('provider.payment.quotation');
+  Resource<PaymentQuote> _quotation = Resource(data: null, isLoading: false, error: null);
+  late OrganizationsProvider _organizations;
+  bool _isLoaded = false;
+  PaymentIntent? _lastIntent;
+  final QuotationIntentBuilder _intentBuilder = QuotationIntentBuilder();
+  final QuotationAutoRefreshController _autoRefreshController =
+      QuotationAutoRefreshController();
+  AutoRefreshMode _autoRefreshMode = AutoRefreshMode.on;
+
+  void update(
+    OrganizationsProvider venue, 
+    PaymentAmountProvider payment,
+    WalletsProvider wallets,
+    PaymentFlowProvider flow,
+    RecipientsProvider recipients,
+    PaymentMethodsProvider methods,
+  ) {
+    _organizations = venue;
+    final intent = _intentBuilder.build(
+      payment: payment,
+      wallets: wallets,
+      flow: flow,
+      recipients: recipients,
+      methods: methods,
+    );
+    if (intent == null) return;
+    final lastIntentDto = _lastIntent?.toDTO().toJson();
+    final isSameIntent = lastIntentDto != null &&
+        const DeepCollectionEquality().equals(intent.toDTO().toJson(), lastIntentDto);
+    if (isSameIntent) return;
+    getQuotation(intent);
+  }
+
+  PaymentQuote? get quotation => _quotation.data;
+  bool get isLoading => _quotation.isLoading;
+  Exception? get error => _quotation.error;
+  bool get canRefresh => _lastIntent != null;
+  AutoRefreshMode get autoRefreshMode => _autoRefreshMode;
+  bool get isReady => _isLoaded && !_quotation.isLoading && _quotation.error == null;
+  bool get hasLiveQuote => isReady && quotation != null && !isExpired;
+
+  DateTime? get quoteExpiresAt {
+    final expiresAtUnixMs = quotation?.fxQuote?.expiresAtUnixMs;
+    if (expiresAtUnixMs == null) return null;
+    return DateTime.fromMillisecondsSinceEpoch(expiresAtUnixMs, isUtc: true);
+  }
+
+  Duration? get quoteTimeLeft {
+    final expiresAt = quoteExpiresAt;
+    if (expiresAt == null) return null;
+    return expiresAt.difference(DateTime.now().toUtc());
+  }
+
+  bool get isExpired {
+    final timeLeft = quoteTimeLeft;
+    if (timeLeft == null) return false;
+    return timeLeft <= Duration.zero;
+  }
+
+  QuoteStatusType get quoteStatusType {
+    if (isLoading) return QuoteStatusType.loading;
+    if (error != null) return QuoteStatusType.error;
+    if (quotation == null) return QuoteStatusType.missing;
+    if (isExpired) return QuoteStatusType.expired;
+    return QuoteStatusType.active;
+  }
+
+  Asset? get fee => _assetFromMoney(quotation?.expectedFeeTotal);
+  Asset? get total => _assetFromMoney(quotation?.debitAmount);
+  Asset? get recipientGets => _assetFromMoney(quotation?.expectedSettlementAmount);
+
+  Asset? _assetFromMoney(Money? money) {
+    if (money == null) return null;
+    return createAsset(money.currency, money.amount);
+  }
+
+  void _setResource(Resource<PaymentQuote> quotation) {
+    _quotation = quotation;
+    _syncAutoRefresh();
+    notifyListeners();
+  }
+
+  void setAutoRefreshMode(AutoRefreshMode mode) {
+    if (_autoRefreshMode == mode) return;
+    _autoRefreshMode = mode;
+    _syncAutoRefresh();
+    notifyListeners();
+  }
+
+  Future<PaymentQuote?> refreshQuotation() async {
+    final intent = _lastIntent;
+    if (intent == null) return null;
+    return getQuotation(intent);
+  }
+
+  Future<PaymentQuote?> getQuotation(PaymentIntent intent) async {
+    if (!_organizations.isOrganizationSet) throw StateError('Organization is not set');
+    _lastIntent = intent;
+    try {
+      _setResource(_quotation.copyWith(isLoading: true, error: null));
+      final response = await QuotationService.getQuotation(
+        _organizations.current.id, 
+        QuotePaymentRequest(
+          idempotencyKey: Uuid().v4(),
+          intent: intent.toDTO(),
+        ),
+      );
+      _isLoaded = true;
+      _setResource(_quotation.copyWith(data: response, isLoading: false, error: null));
+    } catch (e, st) {
+      _logger.warning('Failed to get quotation', e, st);
+      _setResource(_quotation.copyWith(
+        data: null,
+        error: e is Exception ? e : Exception(e.toString()),
+        isLoading: false,
+      ));
+    }
+    return _quotation.data;
+  }
+
+  void reset() {
+    _isLoaded = false;
+    _lastIntent = null;
+    _autoRefreshMode = AutoRefreshMode.off;
+    _autoRefreshController.reset();
+    _setResource(Resource(data: null, isLoading: false, error: null));
+  }
+
+  void _syncAutoRefresh() {
+    final isAutoRefreshEnabled = _autoRefreshMode == AutoRefreshMode.on;
+    _autoRefreshController.setEnabled(isAutoRefreshEnabled);
+    final canAutoRefresh = isAutoRefreshEnabled && canRefresh;
+    _autoRefreshController.sync(
+      isLoading: isLoading,
+      canRefresh: canAutoRefresh,
+      expiresAt: quoteExpiresAt,
+      onRefresh: refreshQuotation,
+    );
+  }
+
+  @override
+  void dispose() {
+    _autoRefreshController.dispose();
+    super.dispose();
+  }
+}

frontend/pshared/lib/provider/resource.dart

@@ -5,11 +5,14 @@ class Resource<T> {
 
   Resource({this.data, this.isLoading = false, this.error});
 
-  Resource<T> copyWith({T? data, bool? isLoading, Exception? error}) {
+  static const _unset = Object();
+
+  Resource<T> copyWith({T? data, bool? isLoading, Object? error = _unset}) {
     return Resource<T>(
       data: data ?? this.data,
       isLoading: isLoading ?? this.isLoading,
-      error: error ?? this.error,
+      // Distinguish "not provided" from an explicit null to allow clearing error.
+      error: error == _unset ? this.error : error as Exception?,
     );
   }
 }

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

@@ -5,9 +5,9 @@ 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/data/mapper/payment/quote/quotes.dart';
+import 'package:pshared/models/payment/quote/quote.dart';
+import 'package:pshared/models/payment/quote/quotes.dart';
 import 'package:pshared/service/authorization/service.dart';
 import 'package:pshared/service/services.dart';