Merge pull request 'added wallet source to quotation preparation' (#152) from wallet-151 into main

Reviewed-on: #152

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

@@ -1,6 +1,6 @@
 import 'package:pshared/data/dto/wallet/asset.dart';
 import 'package:pshared/data/mapper/payment/enums.dart';
-import 'package:pshared/models/wallet/wallet.dart';
+import 'package:pshared/models/wallet/asset.dart';
 
 
 extension WalletAssetDTOMapper on WalletAssetDTO {

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

@@ -1,17 +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';
 
-import 'package:pweb/models/wallet.dart';
 
 extension WalletUiMapper on domain.WalletModel {
   Wallet toUi() {
     final amountStr = availableMoney?.amount ?? balance?.available?.amount ?? '0';
-    final currencyStr = availableMoney?.currency ?? balance?.available?.currency ?? Currency.usd.toString().toUpperCase();
     final parsedAmount = double.tryParse(amountStr) ?? 0;
-    final currency = Currency.values.firstWhere(
+    final currency = currencyStringToCode(asset.tokenSymbol);
-      (c) => c.name.toUpperCase() == currencyStr.toUpperCase(),
-      orElse: () => Currency.usd,
-    );
     return Wallet(
       id: walletRef,
       walletUserID: walletRef,

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

@@ -3,6 +3,7 @@ import 'package:pshared/models/payment/methods/card.dart';
 import 'package:pshared/models/payment/methods/crypto_address.dart';
 import 'package:pshared/models/payment/methods/data.dart';
 import 'package:pshared/models/payment/methods/iban.dart';
+import 'package:pshared/models/payment/methods/managed_wallet.dart';
 import 'package:pshared/models/payment/methods/russian_bank.dart';
 import 'package:pshared/models/payment/methods/wallet.dart';
 import 'package:pshared/models/payment/type.dart';
@@ -43,6 +44,7 @@ class PaymentMethod implements PermissionBoundStorable, Describable {
   IbanPaymentMethod? get ibanData => dataAsOrNull<IbanPaymentMethod>();
   RussianBankAccountPaymentMethod? get bankAccountData => dataAsOrNull<RussianBankAccountPaymentMethod>();
   WalletPaymentMethod? get walletData => dataAsOrNull<WalletPaymentMethod>();
+  ManagedWalletPaymentMethod? get managedWalletData => dataAsOrNull<ManagedWalletPaymentMethod>();
   CryptoAddressPaymentMethod? get cryptoAddressData => dataAsOrNull<CryptoAddressPaymentMethod>();
 
   @override

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

@@ -2,6 +2,7 @@ import 'package:pshared/models/currency.dart';
 import 'package:pshared/models/describable.dart';
 import 'package:pshared/models/payment/chain_network.dart';
 
+
 class Wallet implements Describable {
   final String id;
   final String walletUserID; // ID or number that we show the user

frontend/pshared/lib/models/wallet/asset.dart

@@ -0,0 +1,14 @@
+import 'package:pshared/models/payment/chain_network.dart';
+
+
+class WalletAsset {
+  final ChainNetwork chain;
+  final String tokenSymbol;
+  final String contractAddress;
+
+  const WalletAsset({
+    required this.chain,
+    required this.tokenSymbol,
+    required this.contractAddress,
+  });
+}

frontend/pshared/lib/models/wallet/wallet.dart

@@ -1,21 +1,9 @@
 import 'package:pshared/models/describable.dart';
-import 'package:pshared/models/payment/chain_network.dart';
+import 'package:pshared/models/wallet/asset.dart';
 import 'package:pshared/models/wallet/balance.dart';
 import 'package:pshared/models/wallet/money.dart';
 
 
-class WalletAsset {
-  final ChainNetwork chain;
-  final String tokenSymbol;
-  final String contractAddress;
-
-  const WalletAsset({
-    required this.chain,
-    required this.tokenSymbol,
-    required this.contractAddress,
-  });
-}
-
 class WalletModel implements Describable {
   final String walletRef;
   final String organizationRef;
@@ -55,20 +43,18 @@ class WalletModel implements Describable {
     WalletBalance? balance,
     WalletMoney? availableMoney,
     Describable? describable,
-  }) {
+  }) => WalletModel(
-    return WalletModel(
+    walletRef: walletRef,
-      walletRef: walletRef,
+    organizationRef: organizationRef,
-      organizationRef: organizationRef,
+    ownerRef: ownerRef,
-      ownerRef: ownerRef,
+    asset: asset,
-      asset: asset,
+    depositAddress: depositAddress,
-      depositAddress: depositAddress,
+    status: status,
-      status: status,
+    metadata: metadata,
-      metadata: metadata,
+    createdAt: createdAt,
-      createdAt: createdAt,
+    updatedAt: updatedAt,
-      updatedAt: updatedAt,
+    balance: balance ?? this.balance,
-      balance: balance ?? this.balance,
+    availableMoney: availableMoney ?? this.availableMoney,
-      availableMoney: availableMoney ?? this.availableMoney,
+    describable: describable ?? this.describable,
-      describable: describable ?? this.describable,
+  );
-    );
-  }
 }

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

@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:pshared/models/asset.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/fx/intent.dart';
 import 'package:pshared/models/payment/fx/side.dart';
@@ -11,14 +13,14 @@ 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';
-import 'package:pshared/provider/payment/amount.dart';
-import 'package:pshared/api/requests/payment/quote.dart';
-import 'package:pshared/data/mapper/payment/intent/payment.dart';
 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/wallets.dart';
 import 'package:pshared/provider/resource.dart';
 import 'package:pshared/service/payment/quotation.dart';
+import 'package:pshared/utils/currency.dart';
 
 
 class QuotationProvider extends ChangeNotifier {
@@ -26,31 +28,38 @@ class QuotationProvider extends ChangeNotifier {
   late OrganizationsProvider _organizations;
   bool _isLoaded = false;
 
-  void update(OrganizationsProvider venue, PaymentAmountProvider payment) {
+  void update(
+    OrganizationsProvider venue, 
+    PaymentAmountProvider payment,
+    WalletsProvider wallets,
+  ) {
     _organizations = venue;
-    getQuotation(PaymentIntent(
+    if (wallets.selectedWallet != null) {
-      kind: PaymentKind.payout,
+      getQuotation(PaymentIntent(
-      amount: Money(
+        kind: PaymentKind.payout,
-        amount: payment.amount.toString(), 
+        amount: Money(
-        currency: 'USDT',
+          amount: payment.amount.toString(), 
-      ),
+          // TODO: adapt to possible other sources
-      destination: CardPaymentMethod(
+          currency: currencyCodeToString(wallets.selectedWallet!.currency),
-        pan: '4000000000000077',
-        firstName: 'John',
-        lastName: 'Doe',
-      ),
-      source: ManagedWalletPaymentMethod(
-        managedWalletRef: '',
-      ),
-      fx: FxIntent(
-        pair: CurrencyPair(
-          base: 'USDT', 
-          quote: 'RUB',
         ),
-        side: FxSide.sellBaseBuyQuote,
+        destination: CardPaymentMethod(
-      ),
+          pan: '4000000000000077',
-      settlementMode: payment.payerCoversFee ? SettlementMode.fixReceived : SettlementMode.fixSource,
+          firstName: 'John',
-    ));
+          lastName: 'Doe',
+        ),
+        source: ManagedWalletPaymentMethod(
+          managedWalletRef: wallets.selectedWallet!.id,
+        ),
+        fx: FxIntent(
+          pair: CurrencyPair(
+            base: currencyCodeToString(wallets.selectedWallet!.currency), 
+            quote: 'RUB',
+          ),
+          side: FxSide.sellBaseBuyQuote,
+        ),
+        settlementMode: payment.payerCoversFee ? SettlementMode.fixReceived : SettlementMode.fixSource,
+      ));
+    }
   }
 
   PaymentQuote? get quotation => _quotation.data;

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

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pshared/provider/organizations.dart';
 import 'package:pshared/provider/resource.dart';
+import 'package:pshared/service/payment/wallets.dart';
 import 'package:pshared/utils/exception.dart';
 
-import 'package:pweb/models/wallet.dart';
-import 'package:pweb/services/wallets.dart';
 
 
 class WalletsProvider with ChangeNotifier {

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

@@ -1,8 +1,7 @@
+import 'package:pshared/data/mapper/wallet/ui.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pshared/service/wallet.dart' as shared_wallet_service;
 
-import 'package:pweb/models/wallet.dart';
-import 'package:pweb/data/mappers/wallet_ui.dart';
-
 
 abstract class WalletsService {
   Future<List<Wallet>> getWallets(String organizationRef);

frontend/pshared/lib/utils/currency.dart

@@ -48,6 +48,21 @@ Currency currencyStringToCode(String currencyCode) {
   }
 }
 
+String currencyCodeToString(Currency currencyCode) {
+  switch (currencyCode) {
+    case Currency.usd:
+      return 'USD';
+    case Currency.usdt:
+      return 'USDT';
+    case Currency.usdc:
+      return 'USDC';
+    case Currency.rub:
+      return 'RUB';
+    case Currency.eur:
+      return 'EUR';
+  }
+}
+
 IconData iconForCurrencyType(Currency currencyCode) {
   switch (currencyCode) {
     case Currency.usd:

frontend/pweb/lib/app/router/payout_shell.dart

@@ -10,7 +10,7 @@ import 'package:pshared/provider/recipient/provider.dart';
 
 import 'package:pweb/app/router/pages.dart';
 import 'package:pweb/app/router/payout_routes.dart';
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/pages/address_book/form/page.dart';
 import 'package:pweb/pages/address_book/page/page.dart';
 import 'package:pweb/pages/dashboard/dashboard.dart';
@@ -20,7 +20,7 @@ import 'package:pweb/pages/payout_page/wallet/edit/page.dart';
 import 'package:pweb/pages/report/page.dart';
 import 'package:pweb/pages/settings/profile/page.dart';
 import 'package:pweb/pages/wallet_top_up/page.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 import 'package:pweb/widgets/error/snackbar.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';
 import 'package:pweb/widgets/sidebar/page.dart';

frontend/pweb/lib/main.dart

@@ -13,7 +13,6 @@ import 'package:pshared/provider/permissions.dart';
 import 'package:pshared/provider/account.dart';
 import 'package:pshared/provider/organizations.dart';
 import 'package:pshared/provider/payment/amount.dart';
-import 'package:pshared/provider/payment/quotation.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 
@@ -24,13 +23,13 @@ import 'package:pweb/providers/mock_payment.dart';
 import 'package:pweb/providers/operatioins.dart';
 import 'package:pweb/providers/two_factor.dart';
 import 'package:pweb/providers/upload_history.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 import 'package:pweb/providers/wallet_transactions.dart';
 import 'package:pweb/services/operations.dart';
 import 'package:pweb/services/payments/history.dart';
 import 'package:pweb/services/posthog.dart';
 import 'package:pweb/services/wallet_transactions.dart';
-import 'package:pweb/services/wallets.dart';
+import 'package:pshared/service/payment/wallets.dart';
 import 'package:pweb/providers/account.dart';
 
 
@@ -100,10 +99,6 @@ void main() async {
         ChangeNotifierProvider(
           create: (_) => PaymentAmountProvider(),
         ),
-        ChangeNotifierProxyProvider2<OrganizationsProvider, PaymentAmountProvider, QuotationProvider>(
-          create: (_) => QuotationProvider(),
-          update: (context, orgnization, payment, provider) => provider!..update(orgnization, payment),
-        ),
       ],
       child: const PayApp(),
     ),

frontend/pweb/lib/pages/dashboard/buttons/balance/amount.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'package:pshared/utils/currency.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 
 
 class BalanceAmount extends StatelessWidget {

frontend/pweb/lib/pages/dashboard/buttons/balance/balance.dart

@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/carousel.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';
 

frontend/pweb/lib/pages/dashboard/buttons/balance/card.dart

@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/add_funds.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/header.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 
 class WalletCard extends StatelessWidget {

frontend/pweb/lib/pages/dashboard/buttons/balance/carousel.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/card.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/indicator.dart';

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

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:pshared/models/payment/type.dart';
 import 'package:pshared/models/recipient/recipient.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/balance.dart';
 import 'package:pweb/pages/dashboard/buttons/buttons.dart';
 import 'package:pweb/pages/dashboard/payouts/multiple/title.dart';

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

@@ -8,7 +8,7 @@ import 'package:pweb/pages/dashboard/payouts/summary/fee.dart';
 import 'package:pweb/pages/dashboard/payouts/summary/recipient_receives.dart';
 import 'package:pweb/pages/dashboard/payouts/summary/sent_amount.dart';
 import 'package:pweb/pages/dashboard/payouts/summary/total.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 
 class PaymentSummary extends StatelessWidget {

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

@@ -5,6 +5,7 @@ import 'package:provider/provider.dart';
 import 'package:pshared/provider/organizations.dart';
 import 'package:pshared/provider/payment/amount.dart';
 import 'package:pshared/provider/payment/quotation.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 import 'package:pweb/pages/dashboard/payouts/form.dart';
 
@@ -18,9 +19,9 @@ class PaymentFromWrappingWidget extends StatelessWidget {
       ChangeNotifierProvider(
         create: (_) => PaymentAmountProvider(),
       ),
-      ChangeNotifierProxyProvider2<OrganizationsProvider, PaymentAmountProvider, QuotationProvider>(
+      ChangeNotifierProxyProvider3<OrganizationsProvider, PaymentAmountProvider, WalletsProvider, QuotationProvider>(
         create: (_) => QuotationProvider(),
-        update: (context, orgnization, payment, provider) => provider!..update(orgnization, payment),
+        update: (context, orgnization, payment, wallet, provider) => provider!..update(orgnization, payment, wallet),
       ),
     ],
     child: const PaymentFormWidget(),

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

@@ -11,10 +11,10 @@ import 'package:pshared/models/recipient/recipient.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 
-import 'package:pweb/models/wallet.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:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';
 import 'package:pweb/services/posthog.dart';
 

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

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 import 'package:pweb/utils/payment/dropdown.dart';
 

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

@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
 
 import 'package:pshared/provider/recipient/pmethods.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/pages/payout_page/methods/widget.dart';
 import 'package:pweb/pages/payout_page/wallet/wigets.dart';
 

frontend/pweb/lib/pages/payout_page/wallet/card.dart

@@ -4,9 +4,9 @@ import 'package:provider/provider.dart';
 
 import 'package:pshared/utils/currency.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';
 

frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/buttons.dart

@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
 
 import 'package:pweb/pages/payout_page/wallet/edit/buttons/send.dart';
 import 'package:pweb/pages/payout_page/wallet/edit/buttons/top_up.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 
 class ButtonsWalletWidget extends StatelessWidget {

frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/save.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/utils/dimensions.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';

frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/send.dart

@@ -5,7 +5,7 @@ import 'package:provider/provider.dart';
 import 'package:pshared/models/payment/type.dart';
 
 import 'package:pweb/app/router/payout_routes.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';

frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/top_up.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 import 'package:pweb/app/router/payout_routes.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';

frontend/pweb/lib/pages/payout_page/wallet/edit/fields.dart

@@ -4,7 +4,7 @@ import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
 import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 
 class WalletEditFields extends StatelessWidget {

frontend/pweb/lib/pages/payout_page/wallet/edit/header.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';
 

frontend/pweb/lib/pages/payout_page/wallet/edit/page.dart

@@ -6,7 +6,7 @@ import 'package:pweb/pages/payout_page/wallet/edit/buttons/buttons.dart';
 import 'package:pweb/pages/payout_page/wallet/edit/fields.dart';
 import 'package:pweb/pages/payout_page/wallet/edit/header.dart';
 import 'package:pweb/pages/payout_page/wallet/history/history.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 import 'package:pweb/utils/dimensions.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';

frontend/pweb/lib/pages/payout_page/wallet/history/history.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/pages/payout_page/wallet/history/filters.dart';
 import 'package:pweb/pages/payout_page/wallet/history/table.dart';
 import 'package:pweb/providers/wallet_transactions.dart';

frontend/pweb/lib/pages/payout_page/wallet/wigets.dart

@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/pages/payout_page/wallet/card.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 
 class WalletWidgets extends StatelessWidget {
-  final Function(Wallet) onWalletTap;
+  final void Function(Wallet) onWalletTap;
 
   const WalletWidgets({super.key, required this.onWalletTap});
 
@@ -34,9 +34,7 @@ class WalletWidgets extends StatelessWidget {
           padding: const EdgeInsets.symmetric(vertical: 6.0),
           child: WalletCard(
             wallet: wallet,
-            onTap: () {
+            onTap: () => onWalletTap(wallet),
-              onWalletTap(wallet);
-            },
           ),
         );
       },

frontend/pweb/lib/pages/wallet_top_up/content.dart

@@ -4,7 +4,7 @@ import 'package:pshared/models/payment/chain_network.dart';
 import 'package:pshared/utils/currency.dart';
 import 'package:pshared/utils/l10n/chain.dart';
 
-import 'package:pweb/models/wallet.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pweb/pages/wallet_top_up/details.dart';
 import 'package:pweb/pages/wallet_top_up/header.dart';
 import 'package:pweb/pages/wallet_top_up/meta.dart';

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

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 import 'package:pweb/pages/wallet_top_up/content.dart';
-import 'package:pweb/providers/wallets.dart';
+import 'package:pshared/provider/payment/wallets.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';
 

frontend/pweb/lib/utils/payment/dropdown.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
 import 'package:pshared/models/payment/type.dart';
+import 'package:pshared/models/payment/wallet.dart';
 
-import 'package:pweb/models/wallet.dart';
 import 'package:pweb/pages/payment_methods/icon.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -34,32 +34,28 @@ class _PaymentMethodDropdownState extends State<PaymentMethodDropdown> {
   }
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context) => DropdownButtonFormField<Wallet>(
-    return DropdownButtonFormField<Wallet>(
+    dropdownColor: Theme.of(context).colorScheme.onSecondary,
-      dropdownColor: Theme.of(context).colorScheme.onSecondary,
+    initialValue: _selectedMethod,
-      initialValue: _selectedMethod,
+    decoration: InputDecoration(
-      decoration: InputDecoration(
+      labelText: AppLocalizations.of(context)!.whereGetMoney,
-        labelText: AppLocalizations.of(context)!.whereGetMoney,
+      border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
-        border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
+    ),
+    items: widget.methods.map((method) => DropdownMenuItem<Wallet>(
+      value: method,
+      child: Row(
+        children: [
+          Icon(iconForPaymentType(PaymentType.managedWallet), size: 20),
+          const SizedBox(width: 8),
+          Text(method.name),
+        ],
       ),
-      items: widget.methods.map((method) {
+    )).toList(),
-        return DropdownMenuItem<Wallet>(
+    onChanged: (value) {
-          value: method,
+      if (value != null) {
-          child: Row(
+        setState(() => _selectedMethod = value);
-            children: [
+        widget.onChanged(value);
-              Icon(iconForPaymentType(PaymentType.managedWallet), size: 20),
+      }
-              const SizedBox(width: 8),
+    },
-              Text(method.name),
+  );
-            ],
-          ),
-        );
-      }).toList(),
-      onChanged: (value) {
-        if (value != null) {
-          setState(() => _selectedMethod = value);
-          widget.onChanged(value);
-        }
-      },
-    );
-  }
 }