merge fixes

This commit is contained in:
Stephan D
2025-11-23 15:45:10 +01:00
228 changed files with 5100 additions and 5433 deletions

View File

@@ -11,7 +11,6 @@ import 'package:pshared/config/constants.dart';
import 'package:pshared/provider/account.dart';
import 'package:pshared/provider/locale.dart';
import 'package:pshared/provider/organizations.dart';
import 'package:pshared/provider/pfe/provider.dart';
import 'package:pweb/app/app.dart';
import 'package:pweb/app/timeago.dart';
@@ -26,7 +25,6 @@ import 'package:pweb/providers/upload_history.dart';
import 'package:pweb/providers/wallets.dart';
import 'package:pweb/providers/wallet_transactions.dart';
import 'package:pweb/services/amplitude.dart';
import 'package:pweb/services/auth.dart';
import 'package:pweb/services/operations.dart';
import 'package:pweb/services/payments/payment_methods.dart';
import 'package:pweb/services/payments/upload_history.dart';
@@ -56,19 +54,18 @@ void main() async {
runApp(
MultiProvider(
providers: [
Provider<AuthenticationService>(
create: (_) => AuthenticationService(),
),
ChangeNotifierProxyProvider<AuthenticationService, TwoFactorProvider>(
create: (context) => TwoFactorProvider(
context.read<AuthenticationService>(),
),
update: (context, authService, previous) => TwoFactorProvider(authService),
),
ChangeNotifierProvider(create: (_) => LocaleProvider(null)),
ChangeNotifierProvider(create: (_) => AccountProvider()),
ChangeNotifierProxyProvider<AccountProvider, TwoFactorProvider>(
create: (context) => TwoFactorProvider(
accountProvider: context.read<AccountProvider>(),
),
update: (context, accountProvider, previous) => TwoFactorProvider(
accountProvider: accountProvider,
),
),
ChangeNotifierProvider(create: (_) => OrganizationsProvider()),
ChangeNotifierProvider(create: (_) => PfeProvider()),
ChangeNotifierProvider(create: (_) => AccountProvider()),
ChangeNotifierProvider(create: (_) => CarouselIndexProvider()),
ChangeNotifierProvider(