Merge pull request 'quotation provider now uses payment methods as source for quotation' (#156) from flow-153 into main

Reviewed-on: #156

frontend/pshared/lib/data/mapper/wallet/ui.dart

@@ -1,19 +1,14 @@
-import 'package:pshared/models/currency.dart';
 import 'package:pshared/models/wallet/wallet.dart' as domain;
 import 'package:pshared/models/payment/wallet.dart';
 import 'package:pshared/utils/currency.dart';
 
 
 extension WalletUiMapper on domain.WalletModel {
-  Wallet toUi() {
-    final amountStr = availableMoney?.amount ?? balance?.available?.amount ?? '0';
-    final parsedAmount = double.tryParse(amountStr) ?? 0;
-    final currency = currencyStringToCode(asset.tokenSymbol);
-    return Wallet(
+  Wallet toUi() => Wallet(
     id: walletRef,
     walletUserID: walletRef,
-      balance: parsedAmount,
-      currency: currency,
+    balance: double.tryParse(availableMoney?.amount ?? balance?.available?.amount ?? '0') ?? 0,
+    currency: currencyStringToCode(asset.tokenSymbol),
     isHidden: true,
     calculatedAt: balance?.calculatedAt ?? DateTime.now(),
     depositAddress: depositAddress,
@@ -22,5 +17,4 @@ extension WalletUiMapper on domain.WalletModel {
     contractAddress: asset.contractAddress,
     describable: describable,
   );
-  }
 }

frontend/pshared/lib/provider/account.dart

@@ -1,18 +1,18 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:pshared/models/auth/state.dart';
 
 import 'package:share_plus/share_plus.dart';
 
 import 'package:pshared/api/errors/unauthorized.dart';
 import 'package:pshared/api/requests/signup.dart';
 import 'package:pshared/api/requests/login_data.dart';
+import 'package:pshared/api/responses/confirmation.dart';
 import 'package:pshared/config/constants.dart';
 import 'package:pshared/models/account/account.dart';
-import 'package:pshared/api/responses/confirmation.dart';
 import 'package:pshared/models/auth/login_outcome.dart';
 import 'package:pshared/models/auth/pending_login.dart';
+import 'package:pshared/models/auth/state.dart';
 import 'package:pshared/models/describable.dart';
 import 'package:pshared/models/storable.dart';
 import 'package:pshared/provider/locale.dart';

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

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 
+import 'package:collection/collection.dart';
+
 import 'package:uuid/uuid.dart';
 
 import 'package:pshared/api/requests/payment/quote.dart';
@@ -9,7 +11,6 @@ import 'package:pshared/models/payment/currency_pair.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/card.dart';
 import 'package:pshared/models/payment/methods/managed_wallet.dart';
 import 'package:pshared/models/payment/money.dart';
 import 'package:pshared/models/payment/settlement_mode.dart';
@@ -17,7 +18,9 @@ import 'package:pshared/models/payment/intent.dart';
 import 'package:pshared/models/payment/quote.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/pmethods.dart';
 import 'package:pshared/provider/resource.dart';
 import 'package:pshared/service/payment/quotation.dart';
 import 'package:pshared/utils/currency.dart';
@@ -32,9 +35,13 @@ class QuotationProvider extends ChangeNotifier {
     OrganizationsProvider venue, 
     PaymentAmountProvider payment,
     WalletsProvider wallets,
+    PaymentFlowProvider flow,
+    PaymentMethodsProvider methods,
   ) {
     _organizations = venue;
-    if (wallets.selectedWallet != null) {
+    final t = flow.selectedType;
+    final method = methods.methods.firstWhereOrNull((m) => m.type == t);
+    if ((wallets.selectedWallet != null) && (method != null)) {
       getQuotation(PaymentIntent(
         kind: PaymentKind.payout,
         amount: Money(
@@ -42,18 +49,14 @@ class QuotationProvider extends ChangeNotifier {
           // TODO: adapt to possible other sources
           currency: currencyCodeToString(wallets.selectedWallet!.currency),
         ),
-        destination: CardPaymentMethod(
-          pan: '4000000000000077',
-          firstName: 'John',
-          lastName: 'Doe',
-        ),
+        destination: method.data,
         source: ManagedWalletPaymentMethod(
           managedWalletRef: wallets.selectedWallet!.id,
         ),
         fx: FxIntent(
           pair: CurrencyPair(
             base: currencyCodeToString(wallets.selectedWallet!.currency), 
-            quote: 'RUB',
+            quote: 'RUB', // TODO: exentd target currencies
           ),
           side: FxSide.sellBaseBuyQuote,
         ),

frontend/pweb/lib/pages/dashboard/payouts/widget.dart

@@ -4,8 +4,10 @@ import 'package:provider/provider.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/quotation.dart';
 import 'package:pshared/provider/payment/wallets.dart';
+import 'package:pshared/provider/recipient/pmethods.dart';
 
 import 'package:pweb/pages/dashboard/payouts/form.dart';
 
@@ -19,9 +21,9 @@ class PaymentFromWrappingWidget extends StatelessWidget {
       ChangeNotifierProvider(
         create: (_) => PaymentAmountProvider(),
       ),
-      ChangeNotifierProxyProvider3<OrganizationsProvider, PaymentAmountProvider, WalletsProvider, QuotationProvider>(
+      ChangeNotifierProxyProvider5<OrganizationsProvider, PaymentAmountProvider, WalletsProvider, PaymentFlowProvider, PaymentMethodsProvider, QuotationProvider>(
         create: (_) => QuotationProvider(),
-        update: (context, orgnization, payment, wallet, provider) => provider!..update(orgnization, payment, wallet),
+        update: (context, orgnization, payment, wallet, flow, methods, provider) => provider!..update(orgnization, payment, wallet, flow, methods),
       ),
     ],
     child: const PaymentFormWidget(),

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

@@ -8,11 +8,11 @@ import 'package:pshared/models/payment/methods/data.dart';
 import 'package:pshared/models/payment/methods/type.dart';
 import 'package:pshared/models/payment/type.dart';
 import 'package:pshared/models/recipient/recipient.dart';
+import 'package:pshared/provider/payment/flow.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 
 import 'package:pshared/models/payment/wallet.dart';
-import 'package:pweb/providers/payment_flow.dart';
 import 'package:pweb/pages/payment_methods/payment_page/body.dart';
 import 'package:pshared/provider/payment/wallets.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';

frontend/pweb/lib/pages/payment_methods/payment_page/content.dart

@@ -6,6 +6,7 @@ import 'package:pshared/models/payment/methods/data.dart';
 import 'package:pshared/models/recipient/recipient.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
+import 'package:pshared/provider/payment/flow.dart';
 
 import 'package:pweb/pages/payment_methods/payment_page/back_button.dart';
 import 'package:pweb/pages/payment_methods/payment_page/header.dart';
@@ -15,7 +16,6 @@ import 'package:pweb/pages/dashboard/payouts/form.dart';
 import 'package:pweb/pages/payment_methods/widgets/payment_info_section.dart';
 import 'package:pweb/pages/payment_methods/widgets/recipient_section.dart';
 import 'package:pweb/pages/payment_methods/widgets/section_title.dart';
-import 'package:pweb/providers/payment_flow.dart';
 import 'package:pweb/utils/dimensions.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';
 

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

@@ -6,6 +6,7 @@ import 'package:pshared/models/payment/methods/data.dart';
 import 'package:pshared/models/recipient/recipient.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
+import 'package:pshared/provider/payment/flow.dart';
 
 import 'package:pweb/pages/dashboard/payouts/widget.dart';
 import 'package:pweb/pages/payment_methods/payment_page/back_button.dart';
@@ -15,7 +16,6 @@ import 'package:pweb/pages/payment_methods/payment_page/send_button.dart';
 import 'package:pweb/pages/payment_methods/widgets/payment_info_section.dart';
 import 'package:pweb/pages/payment_methods/widgets/recipient_section.dart';
 import 'package:pweb/pages/payment_methods/widgets/section_title.dart';
-import 'package:pweb/providers/payment_flow.dart';
 import 'package:pweb/utils/dimensions.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';
 

frontend/pweb/lib/pages/payment_methods/widgets/payment_info_section.dart

@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
 import 'package:pshared/models/payment/methods/data.dart';
 import 'package:pshared/models/payment/type.dart';
 import 'package:pshared/models/recipient/recipient.dart';
+import 'package:pshared/provider/payment/flow.dart';
 
 import 'package:pweb/pages/payment_methods/form.dart';
 import 'package:pweb/pages/payment_methods/widgets/section_title.dart';
-import 'package:pweb/providers/payment_flow.dart';
 import 'package:pweb/utils/dimensions.dart';
 import 'package:pweb/utils/payment/selector_type.dart';