minor improvements on initialization

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,34 +8,44 @@ assignees: ''
 ---
 
 **Describe the bug**
+
 A clear and concise description of what the bug is.
 
 **To Reproduce**
+
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
 **Expected behavior**
+
 A clear and concise description of what you expected to happen.
 
 **Reproducible code**
-If applicable, add a minimum reproducible code snippet.
+
+If applicable, add a minimum reproducible code snippet. 
+A minimum reproducible code should have only Reown's SDK as dependency (besides flutter sdk of course)
+There is no point you copy/paste your code if we can't run it as it is on our side.
 
 **Screenshots**
+
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
+
  - OS: [e.g. iOS]
  - Browser [e.g. chrome, safari]
  - Version [e.g. 22]
 
 **Smartphone (please complete the following information):**
+
  - Device: [e.g. iPhone6]
  - OS: [e.g. iOS8.1]
  - Browser [e.g. stock browser, safari]
  - Version [e.g. 22]
 
 **Additional context**
+
 Add any other context about the problem here.

packages/reown_appkit/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 1.1.0-beta01
+## 1.1.0-beta02
 
 - Social Logins
 

packages/reown_appkit/lib/modal/appkit_modal_impl.dart

@@ -54,7 +54,7 @@ class ReownAppKitModal with ChangeNotifier implements IReownAppKitModal {
   Map<String, RequiredNamespace> _optionalNamespaces = {};
   String? _lastChainEmitted;
   bool _supportsOneClickAuth = false;
-  bool _serviceInitialized = false;
+  bool _relayConnected = false;
 
   ReownAppKitModalStatus _status = ReownAppKitModalStatus.idle;
   @override
@@ -194,8 +194,8 @@ class ReownAppKitModal with ChangeNotifier implements IReownAppKitModal {
       core: _appKit.core,
     );
 
-    GetIt.I.registerSingleton<IMagicService>(
-      MagicService(
+    GetIt.I.registerSingletonIfAbsent<IMagicService>(
+      () => MagicService(
         core: _appKit.core,
         metadata: _appKit.metadata,
         featuresConfig: this.featuresConfig,
@@ -235,9 +235,13 @@ class ReownAppKitModal with ChangeNotifier implements IReownAppKitModal {
     return false;
   }
 
+  Completer<bool> _awaitRelayOnce = Completer<bool>();
+
   @override
   Future<void> init() async {
-    _serviceInitialized = false;
+    _relayConnected = false;
+    _awaitRelayOnce = Completer<bool>();
+
     if (!CoreUtils.isValidProjectID(_projectId)) {
       _appKit.core.logger.e(
         '[$runtimeType] projectId $_projectId is invalid. '
@@ -332,12 +336,18 @@ class ReownAppKitModal with ChangeNotifier implements IReownAppKitModal {
 
     onModalNetworkChange.subscribe(_onNetworkChainRequireSIWE);
 
-    final connected = _appKit.core.relayClient.isConnected;
-    _serviceInitialized = connected;
-    _status = connected
+    _relayConnected = _appKit.core.relayClient.isConnected;
+    if (!_relayConnected) {
+      _relayConnected = await _awaitRelayOnce.future;
+    } else {
+      if (!_awaitRelayOnce.isCompleted) {
+        _awaitRelayOnce.complete(_relayConnected);
+      }
+    }
+    _status = _relayConnected
         ? ReownAppKitModalStatus.initialized
-        : ReownAppKitModalStatus.error;
-    _appKit.core.logger.i('[$runtimeType] initialized');
+        : ReownAppKitModalStatus.initializing;
+    _appKit.core.logger.i('[$runtimeType] status $_status');
     _notify();
   }
 
@@ -595,7 +605,6 @@ class ReownAppKitModal with ChangeNotifier implements IReownAppKitModal {
     Widget? startWidget,
   }) async {
     _checkInitialized();
-    ApproveTransactionPage();
 
     if (_isOpen) {
       closeModal();
@@ -1966,17 +1975,20 @@ extension _AppKitModalExtension on ReownAppKitModal {
     _appKit.core.logger.i('[$runtimeType] relay client connected');
     final service =
         _currentSession?.sessionService ?? ReownAppKitModalConnector.wc;
-    if (service.isWC && _serviceInitialized) {
+    if (service.isWC && _relayConnected) {
       _status = ReownAppKitModalStatus.initialized;
       _notify();
     }
+    if (!_awaitRelayOnce.isCompleted) {
+      _awaitRelayOnce.complete(true);
+    }
   }
 
   void _onRelayClientDisconnect(EventArgs? args) {
     _appKit.core.logger.i('[$runtimeType] relay client disconnected');
     final service =
         _currentSession?.sessionService ?? ReownAppKitModalConnector.wc;
-    if (service.isWC && _serviceInitialized) {
+    if (service.isWC && _relayConnected) {
       _status = ReownAppKitModalStatus.idle;
       _notify();
     }

packages/reown_appkit/pubspec.yaml

@@ -1,6 +1,6 @@
 name: reown_appkit
 description: "Reown is the onchain UX platform that provides toolkits built on top of the WalletConnect Network"
-version: 1.1.0-beta01
+version: 1.1.0-beta02
 homepage: https://github.com/reown-com/reown_flutter
 repository: https://github.com/reown-com/reown_flutter/tree/master/packages/reown_appkit
 documentation: https://docs.reown.com/appkit/flutter/core/installation