fix: auth scope init (#1171)

espresso-cash · Dec 22, 2023 · 82d77ae · 82d77ae
1 parent 345d4a7
commit 82d77ae
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 41 deletions.
diff --git a/packages/espressocash_app/lib/core/feature_flags.dart b/packages/espressocash_app/lib/core/feature_flags.dart
@@ -6,7 +6,7 @@ import 'package:injectable/injectable.dart';
 class FeatureFlagsManager {
   final _remoteConfig = FirebaseRemoteConfig.instance;
 
-  @PostConstruct()
+  @PostConstruct(preResolve: true)
   Future<void> init() async {
     try {
       await _remoteConfig.setConfigSettings(

diff --git a/packages/espressocash_app/lib/features/authenticated/screens/authenticated_flow_screen.dart b/packages/espressocash_app/lib/features/authenticated/screens/authenticated_flow_screen.dart
@@ -7,6 +7,7 @@ import '../../../di.config.dart';
 import '../../../di.dart';
 import '../../../gen/assets.gen.dart';
 import '../../../routes.gr.dart';
+import '../../../ui/splash_screen.dart';
 import '../../accounts/models/account.dart';
 import '../../accounts/services/accounts_bloc.dart';
 import '../../activities/module.dart';
@@ -43,11 +44,12 @@ class AuthenticatedFlowScreen extends StatefulWidget {
 
 class _AuthenticatedFlowScreenState extends State<AuthenticatedFlowScreen> {
   final _homeRouterKey = GlobalKey<AutoRouterState>();
+  late final Future<void> _initScope;
 
   @override
   void initState() {
     super.initState();
-    sl.initAuthScope();
+    _initScope = sl.initAuthScope();
   }
 
   @override
@@ -67,43 +69,50 @@ class _AuthenticatedFlowScreenState extends State<AuthenticatedFlowScreen> {
   }
 
   @override
-  Widget build(BuildContext _) => MultiProvider(
-        providers: const [
-          ConversionRatesModule(),
-        ],
-        child: BlocBuilder<AccountsBloc, AccountsState>(
-          builder: (context, state) {
-            final account = state.account;
-            if (account == null) return Container();
+  Widget build(BuildContext _) => FutureBuilder(
+        future: _initScope,
+        builder: (context, snapshot) {
+          if (!snapshot.hasData) return const SplashScreen();
 
-            return MultiProvider(
-              providers: [
-                Provider<MyAccount>.value(value: account),
-                const BackupPhraseModule(),
-                const PaymentRequestModule(),
-                Provider<HomeRouterKey>(
-                  create: (_) => HomeRouterKey(_homeRouterKey),
-                ),
-                const ODPModule(),
-                const OLPModule(),
-                const InvestmentModule(),
-                const ActivitiesModule(),
-                const FavoriteTokensModule(),
-                const SwapModule(),
-                const PopularTokensModule(),
-                const MobileWalletModule(),
-              ],
-              child: AutoRouter(
-                key: _homeRouterKey,
-                builder: (context, child) => MultiProvider(
-                  providers: const [
-                    ILPModule(),
+          return MultiProvider(
+            providers: const [
+              ConversionRatesModule(),
+            ],
+            child: BlocBuilder<AccountsBloc, AccountsState>(
+              builder: (context, state) {
+                final account = state.account;
+                if (account == null) return const SplashScreen();
+
+                return MultiProvider(
+                  providers: [
+                    Provider<MyAccount>.value(value: account),
+                    const BackupPhraseModule(),
+                    const PaymentRequestModule(),
+                    Provider<HomeRouterKey>(
+                      create: (_) => HomeRouterKey(_homeRouterKey),
+                    ),
+                    const ODPModule(),
+                    const OLPModule(),
+                    const InvestmentModule(),
+                    const ActivitiesModule(),
+                    const FavoriteTokensModule(),
+                    const SwapModule(),
+                    const PopularTokensModule(),
+                    const MobileWalletModule(),
                   ],
-                  child: child,
-                ),
-              ),
-            );
-          },
-        ),
+                  child: AutoRouter(
+                    key: _homeRouterKey,
+                    builder: (context, child) => MultiProvider(
+                      providers: const [
+                        ILPModule(),
+                      ],
+                      child: child,
+                    ),
+                  ),
+                );
+              },
+            ),
+          );
+        },
       );
 }
diff --git a/packages/espressocash_app/lib/features/ramp/data/on_ramp_order_service.dart b/packages/espressocash_app/lib/features/ramp/data/on_ramp_order_service.dart
@@ -43,7 +43,7 @@ class OnRampOrderService implements Disposable {
   final MyDatabase _db;
   final TokenList _tokens;
 
-  @PostConstruct()
+  @PostConstruct(preResolve: true)
   Future<void> init() async {
     final query = _db.select(_db.onRampOrderRows)
       ..where(

diff --git a/packages/espressocash_app/lib/features/ramp/services/off_ramp_order_service.dart b/packages/espressocash_app/lib/features/ramp/services/off_ramp_order_service.dart
@@ -53,7 +53,7 @@ class OffRampOrderService implements Disposable {
   final MyDatabase _db;
   final TokenList _tokens;
 
-  @PostConstruct()
+  @PostConstruct(preResolve: true)
   Future<void> init() async {
     final query = _db.select(_db.offRampOrderRows)
       ..where(

diff --git a/packages/espressocash_app/lib/routes.dart b/packages/espressocash_app/lib/routes.dart
@@ -101,7 +101,7 @@ class AppRouter extends $AppRouter {
     AutoRoute(
       page: SignInFlowRoute.page,
       children: [
-        AutoRoute(path: '', page: GetStartedRoute.page),
+        AutoRoute(page: GetStartedRoute.page),
         AutoRoute(page: CreateWalletLoadingRoute.page),
         AutoRoute(page: RestoreAccountRoute.page),
         AutoRoute(page: WebViewRoute.page),