tech/sendico
2
0
Fork 0
Code Issues 22 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Top Up Balance logic and Added fixes for routing

Browse Source
This commit is contained in:
Arseni
2025-12-05 20:29:43 +03:00
parent f7bf3138ac
commit bf39b1d401
27 changed files with 972 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/pweb/lib/pages/dashboard/buttons/balance/balance.dart
View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/models/wallet.dart';
import 'package:pweb/pages/dashboard/buttons/balance/carousel.dart';
import 'package:pweb/providers/wallets.dart';
@@ -9,7 +10,9 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
class BalanceWidget extends StatelessWidget {
const BalanceWidget({super.key});
final ValueChanged<Wallet> onTopUp;
const BalanceWidget({super.key, required this.onTopUp});
@override
Widget build(BuildContext context) {
@@ -30,6 +33,7 @@ class BalanceWidget extends StatelessWidget {
WalletCarousel(
wallets: wallets,
onWalletChanged: walletsProvider.selectWallet,
onTopUp: onTopUp,
);
}
}

6
frontend/pweb/lib/pages/dashboard/buttons/balance/card.dart
View File

@@ -12,10 +12,12 @@ import 'package:pweb/providers/wallets.dart';
class WalletCard extends StatelessWidget {
final Wallet wallet;
final VoidCallback onTopUp;
const WalletCard({
super.key,
required this.wallet,
required this.onTopUp,
});
@override
@@ -43,7 +45,7 @@ class WalletCard extends StatelessWidget {
),
BalanceAddFunds(
onTopUp: () {
// TODO: Implement top-up functionality
onTopUp();
},
),
],
@@ -51,4 +53,4 @@ class WalletCard extends StatelessWidget {
),
);
}
}
}

14
frontend/pweb/lib/pages/dashboard/buttons/balance/carousel.dart
View File

@@ -12,11 +12,13 @@ import 'package:pweb/providers/carousel.dart';
class WalletCarousel extends StatefulWidget {
final List<Wallet> wallets;
final ValueChanged<Wallet> onWalletChanged;
final ValueChanged<Wallet> onTopUp;
const WalletCarousel({
super.key,
required this.wallets,
required this.onWalletChanged,
required this.onTopUp,
});
@override
@@ -33,6 +35,11 @@ class _WalletCarouselState extends State<WalletCarousel> {
_pageController = PageController(
viewportFraction: WalletCardConfig.viewportFraction,
);
WidgetsBinding.instance.addPostFrameCallback((_) {
if (widget.wallets.isNotEmpty) {
widget.onWalletChanged(widget.wallets[_currentPage]);
}
});
}
@override
@@ -83,7 +90,10 @@ class _WalletCarouselState extends State<WalletCarousel> {
itemBuilder: (context, index) {
return Padding(
padding: WalletCardConfig.cardPadding,
child: WalletCard(wallet: widget.wallets[index]),
child: WalletCard(
wallet: widget.wallets[index],
onTopUp: () => widget.onTopUp(widget.wallets[index]),
),
);
},
),
@@ -110,4 +120,4 @@ class _WalletCarouselState extends State<WalletCarousel> {
],
);
}
}
}

7
frontend/pweb/lib/pages/dashboard/dashboard.dart
View File

@@ -3,6 +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:pweb/pages/dashboard/buttons/balance/balance.dart';
import 'package:pweb/pages/dashboard/buttons/buttons.dart';
import 'package:pweb/pages/dashboard/payouts/multiple/title.dart';
@@ -22,11 +23,13 @@ class AppSpacing {
class DashboardPage extends StatefulWidget {
final ValueChanged<Recipient> onRecipientSelected;
final void Function(PaymentType type) onGoToPaymentWithoutRecipient;
final ValueChanged<Wallet> onTopUp;
const DashboardPage({
super.key,
required this.onRecipientSelected,
required this.onGoToPaymentWithoutRecipient,
required this.onTopUp,
});
@override
@@ -75,7 +78,9 @@ class _DashboardPageState extends State<DashboardPage> {
],
),
const SizedBox(height: AppSpacing.medium),
BalanceWidget(),
BalanceWidget(
onTopUp: widget.onTopUp,
),
const SizedBox(height: AppSpacing.small),
if (_showContainerMultiple) TitleMultiplePayout(),
const SizedBox(height: AppSpacing.medium),

4
frontend/pweb/lib/pages/payment_methods/page.dart
View File

@@ -62,7 +62,7 @@ class _PaymentPageState extends State<PaymentPage> {
final recipientProvider = context.read<RecipientsProvider>();
recipientProvider.setCurrentObject(recipient.id);
pageSelector.selectRecipient(recipient);
pageSelector.selectRecipient(context, recipient);
_flowProvider.reset(pageSelector);
_clearSearchField();
}
@@ -72,7 +72,7 @@ class _PaymentPageState extends State<PaymentPage> {
final recipientProvider = context.read<RecipientsProvider>();
recipientProvider.setCurrentObject(null);
pageSelector.selectRecipient(null);
pageSelector.selectRecipient(context, null);
_flowProvider.reset(pageSelector);
_clearSearchField();
}

2
frontend/pweb/lib/pages/payment_methods/widgets/payment_page_body.dart
View File

@@ -141,7 +141,7 @@ class PaymentBackButton extends StatelessWidget {
if (onBack != null) {
onBack!(pageSelector.selectedRecipient);
} else {
pageSelector.goBackFromPayment();
pageSelector.goBackFromPayment(context);
}
},
),

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

@@ -25,7 +25,7 @@ class SendPayoutButton extends StatelessWidget {
final wallet = walletsProvider.selectedWallet;
if (wallet != null) {
pageSelectorProvider.startPaymentFromWallet(wallet);
pageSelectorProvider.startPaymentFromWallet(context, wallet);
}
},
child: Text(loc.payoutNavSendPayout),

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

@@ -1,5 +1,9 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pweb/providers/page_selector.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -15,9 +19,14 @@ class TopUpButton extends StatelessWidget{
elevation: 0,
),
onPressed: () {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(loc.addFunctionality)),
);
final wallet = context.read<WalletsProvider>().selectedWallet;
if (wallet == null) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(loc.noWalletSelected)),
);
return;
}
context.read<PageSelectorProvider>().openWalletTopUp(context, wallet);
},
child: Text(loc.topUpBalance),
);

96
frontend/pweb/lib/pages/wallet_top_up/address_block.dart Normal file
View File

@@ -0,0 +1,96 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:qr_flutter/qr_flutter.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletTopUpAddressBlock extends StatelessWidget {
final String address;
final AppDimensions dimensions;
const WalletTopUpAddressBlock({
super.key,
required this.address,
required this.dimensions,
});
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final loc = AppLocalizations.of(context)!;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
loc.walletTopUpAddressLabel,
style: theme.textTheme.titleSmall,
),
TextButton.icon(
icon: const Icon(Icons.copy, size: 16),
label: Text(loc.copyAddress),
onPressed: () {
Clipboard.setData(ClipboardData(text: address));
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(loc.addressCopied)),
);
},
),
],
),
const SizedBox(height: 6),
Container(
width: double.infinity,
padding: EdgeInsets.all(dimensions.paddingMedium),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(dimensions.borderRadiusSmall),
border: Border.all(color: theme.colorScheme.outlineVariant),
color: theme.colorScheme.surfaceVariant.withOpacity(0.4),
),
child: SelectableText(
address,
style: theme.textTheme.bodyLarge?.copyWith(
fontFeatures: const [FontFeature.tabularFigures()],
),
),
),
SizedBox(height: dimensions.paddingLarge),
Text(
loc.walletTopUpQrLabel,
style: theme.textTheme.titleSmall,
),
const SizedBox(height: 8),
Container(
padding: EdgeInsets.all(dimensions.paddingMedium),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(dimensions.borderRadiusSmall),
border: Border.all(color: theme.colorScheme.outlineVariant),
color: theme.colorScheme.surfaceVariant.withOpacity(0.4),
),
child: Center(
child: QrImageView(
data: address,
backgroundColor: theme.colorScheme.onSecondary,
eyeStyle: QrEyeStyle(
eyeShape: QrEyeShape.square,
color: theme.colorScheme.onSurface,
),
dataModuleStyle: QrDataModuleStyle(
dataModuleShape: QrDataModuleShape.square,
color: theme.colorScheme.onSurface,
),
size: 220,
),
),
),
],
);
}
}

76
frontend/pweb/lib/pages/wallet_top_up/content.dart Normal file
View File

@@ -0,0 +1,76 @@
import 'package:flutter/material.dart';
import 'package:pweb/models/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';
import 'package:pweb/utils/currency.dart';
import 'package:pweb/utils/dimensions.dart';
class WalletTopUpContent extends StatelessWidget {
final Wallet wallet;
final VoidCallback onBack;
const WalletTopUpContent({
super.key,
required this.wallet,
required this.onBack,
});
@override
Widget build(BuildContext context) {
final dimensions = AppDimensions();
final theme = Theme.of(context);
final address = _resolveAddress(wallet);
final network = wallet.network?.trim();
final assetLabel = wallet.tokenSymbol ?? currencyCodeToSymbol(wallet.currency);
return Align(
alignment: Alignment.topCenter,
child: SingleChildScrollView(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 960),
child: Padding(
padding: EdgeInsets.symmetric(vertical: dimensions.paddingLarge),
child: Material(
elevation: dimensions.elevationSmall,
color: theme.colorScheme.onSecondary,
borderRadius: BorderRadius.circular(dimensions.borderRadiusMedium),
child: Padding(
padding: EdgeInsets.all(dimensions.paddingXLarge),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
WalletTopUpHeader(
onBack: onBack,
walletName: wallet.name,
),
SizedBox(height: dimensions.paddingLarge),
WalletTopUpMeta(
assetLabel: assetLabel,
network: network,
walletId: wallet.walletUserID,
),
SizedBox(height: dimensions.paddingXLarge),
WalletTopUpDetails(
address: address,
dimensions: dimensions,
),
],
),
),
),
),
),
),
);
}
String? _resolveAddress(Wallet wallet) {
final candidate = wallet.depositAddress?.trim();
if (candidate == null || candidate.isEmpty) return null;
return candidate;
}
}

60
frontend/pweb/lib/pages/wallet_top_up/details.dart Normal file
View File

@@ -0,0 +1,60 @@
import 'package:flutter/material.dart';
import 'package:pweb/pages/wallet_top_up/address_block.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletTopUpDetails extends StatelessWidget {
final String? address;
final AppDimensions dimensions;
const WalletTopUpDetails({
super.key,
required this.address,
required this.dimensions,
});
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final loc = AppLocalizations.of(context)!;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
loc.walletTopUpDetailsTitle,
style: theme.textTheme.titleMedium,
),
const SizedBox(height: 6),
Text(
loc.walletTopUpDescription,
style: theme.textTheme.bodyMedium?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
SizedBox(height: dimensions.paddingLarge),
if (address == null || address!.isEmpty)
Text(
loc.walletTopUpUnavailable,
style: theme.textTheme.bodyMedium,
)
else ...[
WalletTopUpAddressBlock(
address: address!,
dimensions: dimensions,
),
SizedBox(height: dimensions.paddingLarge),
Text(
loc.walletTopUpHint,
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
],
],
);
}
}

47
frontend/pweb/lib/pages/wallet_top_up/header.dart Normal file
View File

@@ -0,0 +1,47 @@
import 'package:flutter/material.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletTopUpHeader extends StatelessWidget {
final VoidCallback onBack;
final String walletName;
const WalletTopUpHeader({
super.key,
required this.onBack,
required this.walletName,
});
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final loc = AppLocalizations.of(context)!;
return Row(
children: [
IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: onBack,
),
const SizedBox(width: 8),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
loc.walletTopUpTitle,
style: theme.textTheme.titleLarge,
),
const SizedBox(height: 4),
Text(
walletName,
style: theme.textTheme.bodyMedium?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
],
),
],
);
}
}

48
frontend/pweb/lib/pages/wallet_top_up/info_chip.dart Normal file
View File

@@ -0,0 +1,48 @@
import 'package:flutter/material.dart';
import 'package:pweb/utils/dimensions.dart';
class WalletTopUpInfoChip extends StatelessWidget {
final String label;
final String value;
const WalletTopUpInfoChip({
super.key,
required this.label,
required this.value,
});
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final dimensions = AppDimensions();
return Container(
padding: EdgeInsets.all(dimensions.paddingMedium),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(dimensions.borderRadiusSmall),
border: Border.all(color: theme.colorScheme.outlineVariant),
color: theme.colorScheme.surfaceVariant.withOpacity(0.4),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
label,
style: theme.textTheme.labelMedium?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
const SizedBox(height: 4),
Text(
value,
style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w600,
),
),
],
),
);
}
}

37
frontend/pweb/lib/pages/wallet_top_up/meta.dart Normal file
View File

@@ -0,0 +1,37 @@
import 'package:flutter/material.dart';
import 'package:pweb/pages/wallet_top_up/info_chip.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletTopUpMeta extends StatelessWidget {
final String assetLabel;
final String walletId;
final String? network;
const WalletTopUpMeta({
super.key,
required this.assetLabel,
required this.walletId,
this.network,
});
@override
Widget build(BuildContext context) {
final loc = AppLocalizations.of(context)!;
final dimensions = AppDimensions();
return Wrap(
spacing: dimensions.paddingLarge,
runSpacing: dimensions.paddingLarge,
children: [
WalletTopUpInfoChip(label: loc.walletTopUpAssetLabel, value: assetLabel),
if (network != null && network!.isNotEmpty)
WalletTopUpInfoChip(label: loc.walletTopUpNetworkLabel, value: network!),
WalletTopUpInfoChip(label: loc.walletId, value: walletId),
],
);
}
}

44
frontend/pweb/lib/pages/wallet_top_up/page.dart Normal file
View File

@@ -0,0 +1,44 @@
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:pweb/generated/i18n/app_localizations.dart';
class WalletTopUpPage extends StatelessWidget {
final VoidCallback onBack;
const WalletTopUpPage({super.key, required this.onBack});
@override
Widget build(BuildContext context) {
final loc = AppLocalizations.of(context)!;
return Consumer<WalletsProvider>(
builder: (context, provider, child) {
if (provider.isLoading) {
return const Center(child: CircularProgressIndicator());
}
if (provider.error != null) {
return Center(
child: Text(loc.notificationError(provider.error.toString())),
);
}
final wallet = provider.selectedWallet;
if (wallet == null) {
return Center(child: Text(loc.noWalletSelected));
}
return WalletTopUpContent(
wallet: wallet,
onBack: onBack,
);
},
);
}
}