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

Revert "Merge branch 'devKA' into devka (resolve conflicts)"
Some checks are pending
ci/woodpecker/push/bump_version Pipeline is pending
Details
ci/woodpecker/push/fx_oracle Pipeline is pending
Details
ci/woodpecker/push/ledger Pipeline is pending
Details
ci/woodpecker/push/nats Pipeline is pending
Details
ci/woodpecker/push/notification Pipeline is pending
Details
ci/woodpecker/push/payments_orchestrator Pipeline is pending
Details
ci/woodpecker/push/billing_fees Pipeline was successful
Details
ci/woodpecker/push/bff Pipeline was successful
Details
ci/woodpecker/push/db Pipeline was successful
Details
ci/woodpecker/push/frontend Pipeline is running
Details
ci/woodpecker/push/chain_gateway Pipeline was successful
Details
ci/woodpecker/push/fx_ingestor Pipeline is running
Details

Browse Source 
This reverts commit 5f4184760d, reversing
changes made to 5e1da9617f.

Reverting changes on main
This commit is contained in:
Arseni
2025-12-04 15:38:01 +03:00
parent 5f4184760d
commit 3b04753f4e
7 changed files with 126 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
frontend/pweb/lib/app/router/payout_routes.dart
View File

@@ -1,53 +0,0 @@
import 'package:pweb/app/router/pages.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
const _payoutBasePath = Pages.dashboard;
String payoutPath(PayoutDestination destination) {
final base = routerPage(_payoutBasePath);
switch (destination) {
case PayoutDestination.dashboard:
return base;
case PayoutDestination.recipients:
return '$base/recipients';
case PayoutDestination.addrecipient:
return '$base/recipients/add';
case PayoutDestination.payment:
return '$base/payment';
case PayoutDestination.settings:
return '$base/settings';
case PayoutDestination.reports:
return '$base/reports';
case PayoutDestination.methods:
return '$base/methods';
case PayoutDestination.editwallet:
return '$base/methods/edit';
case PayoutDestination.sendPayout:
return '$base/send';
}
}
PayoutDestination payoutDestinationFromLocation(String location) {
final path = Uri.parse(location).path;
// Check longer paths first to avoid prefix collisions.
for (final entry in _orderedRoutes) {
if (path.startsWith(entry.value)) return entry.key;
}
return PayoutDestination.dashboard;
}
final List<MapEntry<PayoutDestination, String>> _orderedRoutes = [
MapEntry(PayoutDestination.editwallet, payoutPath(PayoutDestination.editwallet)),
MapEntry(PayoutDestination.addrecipient, payoutPath(PayoutDestination.addrecipient)),
MapEntry(PayoutDestination.payment, payoutPath(PayoutDestination.payment)),
MapEntry(PayoutDestination.recipients, payoutPath(PayoutDestination.recipients)),
MapEntry(PayoutDestination.methods, payoutPath(PayoutDestination.methods)),
MapEntry(PayoutDestination.reports, payoutPath(PayoutDestination.reports)),
MapEntry(PayoutDestination.settings, payoutPath(PayoutDestination.settings)),
MapEntry(PayoutDestination.sendPayout, payoutPath(PayoutDestination.sendPayout)),
MapEntry(PayoutDestination.dashboard, payoutPath(PayoutDestination.dashboard)),
];

159
frontend/pweb/lib/app/router/payout_shell.dart
View File

@@ -1,159 +0,0 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:provider/provider.dart';
import 'package:pweb/app/router/pages.dart';
import 'package:pweb/app/router/payout_routes.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';
import 'package:pweb/pages/payout_page/page.dart';
import 'package:pweb/pages/payout_page/wallet/edit/page.dart';
import 'package:pweb/pages/payment_methods/page.dart';
import 'package:pweb/pages/report/page.dart';
import 'package:pweb/pages/settings/profile/page.dart';
import 'package:pweb/providers/page_selector.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
import 'package:pweb/widgets/sidebar/page.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
RouteBase payoutShellRoute() => ShellRoute(
pageBuilder: (context, state, child) => NoTransitionPage(
child: PageSelector(
selected: payoutDestinationFromLocation(state.uri.toString()),
child: child,
),
),
routes: [
GoRoute(
name: Pages.dashboard.name,
path: routerPage(Pages.dashboard),
pageBuilder: (context, state) {
final selector = context.read<PageSelectorProvider>();
return NoTransitionPage(
child: DashboardPage(
onRecipientSelected: (recipient) {
selector.selectRecipient(recipient);
context.go(payoutPath(PayoutDestination.payment));
},
onGoToPaymentWithoutRecipient: (type) {
selector.startPaymentWithoutRecipient(type);
context.go(payoutPath(PayoutDestination.payment));
},
),
);
},
),
GoRoute(
name: 'payoutRecipients',
path: payoutPath(PayoutDestination.recipients),
pageBuilder: (context, state) {
final selector = context.read<PageSelectorProvider>();
return NoTransitionPage(
child: RecipientAddressBookPage(
onRecipientSelected: (recipient) {
selector.selectRecipient(recipient, fromList: true);
context.go(payoutPath(PayoutDestination.payment));
},
onAddRecipient: () {
selector.goToAddRecipient();
context.go(payoutPath(PayoutDestination.addrecipient));
},
onEditRecipient: (recipient) {
selector.editRecipient(recipient, fromList: true);
context.go(payoutPath(PayoutDestination.addrecipient));
},
),
);
},
),
GoRoute(
name: 'payoutAddRecipient',
path: payoutPath(PayoutDestination.addrecipient),
pageBuilder: (context, state) {
final selector = context.read<PageSelectorProvider>();
final recipient = selector.recipientProvider?.selectedRecipient;
return NoTransitionPage(
child: AdressBookRecipientForm(
recipient: recipient,
onSaved: (_) {
selector.selectPage(PayoutDestination.recipients);
context.go(payoutPath(PayoutDestination.recipients));
},
),
);
},
),
GoRoute(
name: 'payoutPayment',
path: payoutPath(PayoutDestination.payment),
pageBuilder: (context, state) {
final selector = context.read<PageSelectorProvider>();
return NoTransitionPage(
child: PaymentPage(
onBack: (_) {
final destination = selector.goBackFromPayment();
context.go(payoutPath(destination));
},
),
);
},
),
GoRoute(
name: 'payoutSettings',
path: payoutPath(PayoutDestination.settings),
pageBuilder: (context, state) => NoTransitionPage(
child: const ProfileSettingsPage(),
),
),
GoRoute(
name: 'payoutReports',
path: payoutPath(PayoutDestination.reports),
pageBuilder: (context, state) => NoTransitionPage(
child: const OperationHistoryPage(),
),
),
GoRoute(
name: 'payoutMethods',
path: payoutPath(PayoutDestination.methods),
pageBuilder: (context, state) {
final selector = context.read<PageSelectorProvider>();
return NoTransitionPage(
child: PaymentConfigPage(
onWalletTap: (wallet) {
selector.selectWallet(wallet);
context.go(payoutPath(PayoutDestination.editwallet));
},
),
);
},
),
GoRoute(
name: 'payoutEditWallet',
path: payoutPath(PayoutDestination.editwallet),
pageBuilder: (context, state) {
final selector = context.read<PageSelectorProvider>();
final wallet = selector.walletsProvider?.selectedWallet;
if (wallet == null) {
final loc = AppLocalizations.of(context)!;
return NoTransitionPage(
child: Center(child: Text(loc.noWalletSelected)),
);
}
return NoTransitionPage(
child: WalletEditPage(
onBack: () {
selector.goBackFromWalletEdit();
context.go(payoutPath(PayoutDestination.methods));
},
),
);
},
),
],
);

38
frontend/pweb/lib/app/router/router.dart
View File

@@ -1,11 +1,13 @@
import 'package:go_router/go_router.dart';
import 'package:pweb/app/router/pages.dart';
import 'package:pweb/app/router/page_params.dart';
import 'package:pweb/pages/2fa/page.dart';
import 'package:pweb/pages/errors/not_found.dart';
import 'package:pweb/pages/login/page.dart';
import 'package:pweb/pages/signup/page.dart';
import 'package:pweb/app/router/payout_shell.dart';
import 'package:pweb/pages/verification/page.dart';
import 'package:pweb/widgets/sidebar/page.dart';
import 'package:pweb/pages/login/page.dart';
import 'package:pweb/pages/errors/not_found.dart';
GoRouter createRouter() => GoRouter(
@@ -21,29 +23,31 @@ GoRouter createRouter() => GoRouter(
path: routerPage(Pages.login),
builder: (_, _) => const LoginPage(),
),
GoRoute(
name: Pages.dashboard.name,
path: routerPage(Pages.dashboard),
builder: (_, _) => const PageSelector(),
),
GoRoute(
name: Pages.sfactor.name,
path: routerPage(Pages.sfactor),
builder: (context, state) {
final isFromSignup = state.uri.queryParameters['from'] == 'signup';
return TwoFactorCodePage(
onVerificationSuccess: () {
if (isFromSignup) {
context.goNamed(Pages.login.name);
} else {
context.goNamed(Pages.dashboard.name);
}
},
);
},
builder: (context, _) => TwoFactorCodePage(
onVerificationSuccess: () {
// trigger organization load
context.goNamed(Pages.dashboard.name);
},
),
),
GoRoute(
name: Pages.signup.name,
path: routerPage(Pages.signup),
builder: (_, _) => const SignUpPage(),
),
payoutShellRoute(),
GoRoute(
name: Pages.verify.name,
path: '${routerPage(Pages.verify)}${routerAddParam(PageParams.token)}',
builder: (_, state) => AccountVerificationPage(token: state.pathParameters[PageParams.token.name]!),
),
],
),
],