fix race condition in deep link loading (#2709)
malik1004x committed
Dec 8, 2025 at 14:49 UTC
f0dd95ff56e96a7e42257f4e8538fa2bee40ce1c
2 files changed
+23
-11
lib/reactions/on_authentication_state_change.dart
+11
-11
@@ -15,6 +15,7 @@ import 'package:cake_wallet/store/settings_store.dart';
15
import 'package:cake_wallet/utils/exception_handler.dart';
16
import 'package:cake_wallet/utils/show_pop_up.dart';
17
import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart';
18
+import 'package:cake_wallet/view_model/link_view_model.dart';
19
import 'package:cw_core/wallet_info.dart';
20
import 'package:cw_core/wallet_type.dart';
21
import 'package:flutter/widgets.dart';
@@ -40,23 +41,19 @@ void startAuthenticationStateChange(
41
_onAuthenticationStateChange ??= autorun((_) async {
42
final state = authenticationStore.state;
43
43
- if (state == AuthenticationState.installed &&
44
- !SettingsStoreBase.walletPasswordDirectInput) {
44
+ if (state == AuthenticationState.installed && !SettingsStoreBase.walletPasswordDirectInput) {
45
try {
46
if (!(await requireHardwareWalletConnection())) await loadCurrentWallet();
47
} catch (error, stack) {
48
loginError = error;
49
await ExceptionHandler.resetLastPopupDate();
50
- await ExceptionHandler.onError(
51
- FlutterErrorDetails(exception: error, stack: stack));
50
+ await ExceptionHandler.onError(FlutterErrorDetails(exception: error, stack: stack));
51
}
52
return;
53
}
54
56
- if ([AuthenticationState.allowed, AuthenticationState.allowedCreate]
57
- .contains(state)) {
58
- if (state == AuthenticationState.allowed &&
59
- (await requireHardwareWalletConnection())) {
55
+ if ([AuthenticationState.allowed, AuthenticationState.allowedCreate].contains(state)) {
56
+ if (state == AuthenticationState.allowed && (await requireHardwareWalletConnection())) {
57
await navigatorKey.currentState!.pushNamedAndRemoveUntil(
58
Routes.connectDevices,
59
(route) => false,
@@ -116,15 +113,18 @@ void startAuthenticationStateChange(
113
114
// await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.connectDevices, (route) => false, arguments: ConnectDevicePageParams(walletType: walletType, onConnectDevice: onConnectDevice));
115
} else {
119
- await navigatorKey.currentState!
120
- .pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
116
+ navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
117
}
118
+ WidgetsBinding.instance.addPostFrameCallback((_) {
119
+ final linkViewModel = getIt.get<LinkViewModel>();
120
+ linkViewModel.markReadyToOpenPage();
121
+ });
122
+
123
if (!(await authenticatedErrorStreamController.stream.isEmpty)) {
124
await ExceptionHandler.showError(
125
(await authenticatedErrorStreamController.stream.first).toString());
126
authenticatedErrorStreamController.stream.drain();
127
}
127
- return;
128
}
129
});
130
}
lib/view_model/link_view_model.dart
+12
@@ -1,3 +1,5 @@
1
+import 'dart:async';
2
+
3
import 'package:cake_wallet/generated/i18n.dart';
4
import 'package:cake_wallet/reactions/wallet_connect.dart';
5
import 'package:cake_wallet/routes.dart';
@@ -21,6 +23,7 @@ class LinkViewModel {
23
final AuthenticationStore authenticationStore;
24
final GlobalKey<NavigatorState> navigatorKey;
25
Uri? currentLink;
26
+ bool readyToOpenPage = false;
27
28
bool get _isValidPaymentUri => currentLink?.path.isNotEmpty ?? false;
29
bool get isWalletConnectLink => currentLink?.authority == 'wc';
@@ -93,7 +96,16 @@ class LinkViewModel {
96
} catch (_) {}
97
}
98
99
+ Future<void> markReadyToOpenPage() async {
100
+ readyToOpenPage = true;
101
+ await handleLink();
102
+ }
103
+
104
Future<void> handleLink() async {
105
+ if (!readyToOpenPage) {
106
+ return;
107
+ }
108
+
109
String? route = getRouteToGo();
110
dynamic args = getRouteArgs();
111
if (route != null) {