Merge pull request 'Moved the payment flow providers from the global level into the payout shell' (#247) from SEND026 into main

Reviewed-on: #247

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

@@ -6,7 +6,13 @@ import 'package:provider/provider.dart';
 
 import 'package:pshared/models/payment/type.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/provider.dart';
+import 'package:pshared/provider/payment/quotation.dart';
 import 'package:pshared/provider/recipient/provider.dart';
+import 'package:pshared/provider/recipient/pmethods.dart';
 
 import 'package:pweb/app/router/pages.dart';
 import 'package:pweb/app/router/payout_routes.dart';
@@ -30,10 +36,40 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
 
 
 RouteBase payoutShellRoute() => ShellRoute(
-  builder: (context, state, child) => PageSelector(
+  builder: (context, state, child) => MultiProvider(
+    providers: [
+      ChangeNotifierProxyProvider2<OrganizationsProvider, RecipientsProvider, PaymentMethodsProvider>(
+        create: (_) => PaymentMethodsProvider(),
+        update: (context, organizations, recipients, provider) => provider!..updateProviders(organizations, recipients),
+      ),
+      ChangeNotifierProxyProvider2<RecipientsProvider, PaymentMethodsProvider, PaymentFlowProvider>(
+        create: (_) => PaymentFlowProvider(initialType: PaymentType.bankAccount),
+        update: (context, recipients, methods, provider) => provider!..update(
+          recipients,
+          methods,
+        ),
+      ),
+      ChangeNotifierProvider(
+        create: (_) => PaymentAmountProvider(),
+      ),
+      ChangeNotifierProxyProvider6<OrganizationsProvider, PaymentAmountProvider, WalletsProvider, PaymentFlowProvider, RecipientsProvider, PaymentMethodsProvider, QuotationProvider>(
+        create: (_) => QuotationProvider(),
+        update: (_, organization, payment, wallet, flow, recipients, methods, provider) =>
+            provider!..update(organization, payment, wallet, flow, recipients, methods),
+      ),
+      ChangeNotifierProxyProvider2<OrganizationsProvider, QuotationProvider, PaymentProvider>(
+        create: (_) => PaymentProvider(),
+        update: (context, organization, quotation, provider) => provider!..update(
+          organization,
+          quotation,
+        ),
+      ),
+    ],
+    child: PageSelector(
     child: child,
     routerState: state,
   ),
+  ),
   routes: [
     GoRoute(
       name: PayoutRoutes.dashboard,

frontend/pweb/lib/main.dart

@@ -13,15 +13,9 @@ import 'package:pshared/provider/permissions.dart';
 import 'package:pshared/provider/account.dart';
 import 'package:pshared/provider/organizations.dart';
 import 'package:pshared/provider/accounts/employees.dart';
-import 'package:pshared/provider/payment/amount.dart';
-import 'package:pshared/provider/payment/flow.dart';
-import 'package:pshared/provider/payment/provider.dart';
-import 'package:pshared/provider/payment/quotation.dart';
 import 'package:pshared/provider/recipient/provider.dart';
-import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/payment/wallets.dart';
 import 'package:pshared/provider/invitations.dart';
-import 'package:pshared/models/payment/type.dart';
 import 'package:pshared/service/payment/wallets.dart';
 
 import 'package:pweb/app/app.dart';
@@ -91,10 +85,6 @@ void main() async {
           create: (_) => InvitationsProvider(),
           update: (context, organizations, provider) => provider!..updateProviders(organizations),
         ),
-        ChangeNotifierProxyProvider2<OrganizationsProvider, RecipientsProvider, PaymentMethodsProvider>(
-          create: (_) => PaymentMethodsProvider(),
-          update: (context, organizations, recipients, provider) => provider!..updateProviders(organizations, recipients),
-        ),
         ChangeNotifierProxyProvider<OrganizationsProvider, WalletsProvider>(
           create: (_) => WalletsProvider(ApiWalletsService()),
           update: (context, organizations, provider) => provider!..update(organizations),
@@ -102,32 +92,9 @@ void main() async {
         ChangeNotifierProvider(
           create: (_) => WalletTransactionsProvider(MockWalletTransactionsService())..load(),
         ),
-        ChangeNotifierProxyProvider2<RecipientsProvider, PaymentMethodsProvider, PaymentFlowProvider>(
-          create: (_) => PaymentFlowProvider(initialType: PaymentType.bankAccount),
-          update: (context, recipients, methods, provider) => provider!..update(
-            recipients,
-            methods,
-          ),
-        ),
-        
         ChangeNotifierProvider(
           create: (_) => OperationProvider(OperationService())..loadOperations(),
         ),
-        ChangeNotifierProvider(
-          create: (_) => PaymentAmountProvider(),
-        ),
-        ChangeNotifierProxyProvider6<OrganizationsProvider, PaymentAmountProvider, WalletsProvider, PaymentFlowProvider, RecipientsProvider, PaymentMethodsProvider, QuotationProvider>(
-          create: (_) => QuotationProvider(),
-          update: (_, organization, payment, wallet, flow, recipients, methods, provider) =>
-              provider!..update(organization, payment, wallet, flow, recipients, methods),
-        ),
-        ChangeNotifierProxyProvider2<OrganizationsProvider, QuotationProvider, PaymentProvider>(
-          create: (_) => PaymentProvider(),
-          update: (context, organization, quotation, provider) => provider!..update(
-            organization,
-            quotation,
-          ),
-        ),
       ],
       child: const PayApp(),
     ),