fix: kyc data first load waiting (#1643)

espresso-cash · Dec 13, 2024 · 8365230 · 8365230
1 parent 708d073
commit 8365230
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/packages/espressocash_app/lib/features/kyc_sharing/services/kyc_service.dart b/packages/espressocash_app/lib/features/kyc_sharing/services/kyc_service.dart
@@ -25,6 +25,13 @@ class KycSharingService extends ValueNotifier<UserData?> {
 
   StreamSubscription<void>? _pollingSubscription;
 
+  final _isInitialized = Completer<void>();
+  Future<void> get initialized => _isInitialized.future.then((_) async {
+        if (value == null) {
+          await fetchUserData();
+        }
+      });
+
   @PostConstruct()
   void init() {
     if (!sl<FeatureFlagsManager>().isBrijEnabled()) return;
@@ -34,6 +41,7 @@ class KycSharingService extends ValueNotifier<UserData?> {
 
   Future<void> _initializeKyc() async {
     await fetchUserData();
+    _isInitialized.complete();
 
     if (value?.kycStatus == ValidationStatus.pending) {
       _subscribe();

diff --git a/packages/espressocash_app/lib/features/profile/widgets/kyc_section.dart b/packages/espressocash_app/lib/features/profile/widgets/kyc_section.dart
@@ -23,10 +23,7 @@ class _KycSectionState extends State<KycSection> {
   @override
   void initState() {
     super.initState();
-    final kycService = sl<KycSharingService>();
-    if (kycService.value == null) {
-      kycService.fetchUserData();
-    }
+    sl<KycSharingService>().initialized;
   }
 
   @override

diff --git a/packages/espressocash_app/lib/features/ramp/partners/kyc/widgets/launch.dart b/packages/espressocash_app/lib/features/ramp/partners/kyc/widgets/launch.dart
@@ -28,7 +28,11 @@ import '../services/brij_on_ramp_order_service.dart';
 
 extension BuildContextExt on BuildContext {
   Future<void> launchKycOnRamp() async {
-    final user = sl<KycSharingService>().value;
+    final kycService = sl<KycSharingService>();
+
+    await runWithLoader(this, () async => kycService.initialized);
+
+    final user = kycService.value;
 
     if (user == null) {
       showCpErrorSnackbar(this, message: l10n.tryAgainLater);
@@ -136,7 +140,11 @@ extension BuildContextExt on BuildContext {
   }
 
   Future<void> launchKycOffRamp() async {
-    final user = sl<KycSharingService>().value;
+    final kycService = sl<KycSharingService>();
+
+    await runWithLoader(this, () async => kycService.initialized);
+
+    final user = kycService.value;
 
     if (user == null) {
       showCpErrorSnackbar(this, message: l10n.tryAgainLater);