minor fix and version up

.github/workflows/build-android-debug.yml

@@ -2,11 +2,11 @@ name: Build Android App Debug (alpha)
 
 on:
   workflow_dispatch:
-  push:
+  # push:
     # branches:
     #   - 'feature/**'
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+(-alpha)+[0-9]*'
+    # tags:
+    #   - 'v[0-9]+.[0-9]+.[0-9]+(-alpha)+[0-9]*'
 
 jobs:
   build_with_signing:

.github/workflows/build-android-internal.yml

@@ -6,7 +6,7 @@ on:
     # branches:
     #   - master
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+(-beta)+[0-9]*'
+      - v[0-9]+.[0-9]+.[0-9]-beta[0-9]{2}
 
 jobs:
   build_with_signing:

.github/workflows/build-android.yml

@@ -6,7 +6,7 @@ on:
     # branches:
     #   - 'release_v*'
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+*'
+      - v[0-9]+.[0-9]+.[0-9]+
 
 jobs:
   build_with_signing:

.github/workflows/build-ios-debug.yml

@@ -2,11 +2,11 @@ name: Build iOS App Debug (alpha)
 
 on:
   workflow_dispatch:
-  push:
+  # push:
     # branches:
     #   - 'feature/**'
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+(-alpha)+[0-9]*'
+    # tags:
+    #   - 'v[0-9]+.[0-9]+.[0-9]+(-alpha)+[0-9]*'
 
 jobs:
   build_with_signing:

.github/workflows/build-ios-internal.yml

@@ -6,7 +6,7 @@ on:
     # branches:
     #   - master
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+(-beta)+[0-9]*'
+      - v[0-9]+.[0-9]+.[0-9]-beta[0-9]{2}
 
 jobs:
   build_with_signing:

.github/workflows/build-ios.yml

@@ -6,7 +6,7 @@ on:
     # branches:
     #   - 'release_v*' #${{ github.ref_name }}
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+*'
+      - v[0-9]+.[0-9]+.[0-9]+
 
 jobs:
   build_with_signing:

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 3.2.0-beta03
+## 3.2.0-beta04
 
 - Email Login support
 - Analytics API support

example/android/gradle.properties

@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 versionName=3.2.0
-versionCode=46
+versionCode=47

example/ios/Runner.xcodeproj/project.pbxproj

@@ -470,7 +470,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 47;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
 				ENABLE_BITCODE = NO;
@@ -496,7 +496,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 47;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.web3modal.flutterExample.RunnerTests;
@@ -514,7 +514,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 47;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.web3modal.flutterExample.RunnerTests;
@@ -530,7 +530,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 47;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.web3modal.flutterExample.RunnerTests;
@@ -655,7 +655,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 47;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
 				ENABLE_BITCODE = NO;
@@ -686,7 +686,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 47;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
 				ENABLE_BITCODE = NO;

example/ios/Runner/Info.plist

@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>46</string>
+	<string>47</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

example/pubspec.lock

@@ -1147,7 +1147,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "3.2.0-beta03"
+    version: "3.2.0-beta04"
   web_socket_channel:
     dependency: transitive
     description:

lib/services/magic_service/magic_service.dart

@@ -91,6 +91,14 @@ class MagicService implements IMagicService {
         key: Key('${_key.hashCode}'),
         controller: _webViewController,
       );
+      isReady.addListener(_readyListener);
+    }
+  }
+
+  final _awaitReadyness = Completer<bool>();
+  void _readyListener() {
+    if (isReady.value && !_awaitReadyness.isCompleted) {
+      _awaitReadyness.complete(true);
     }
   }
 
@@ -250,12 +258,13 @@ class MagicService implements IMagicService {
     String? chainId,
     required SessionRequestParams request,
   }) async {
+    if (!isEnabled.value) return;
+    await _awaitReadyness.future;
     await _rpcRequest(request.toJson());
     return await _response.future;
   }
 
   Future<void> _rpcRequest(Map<String, dynamic> parameters) async {
-    if (!isEnabled.value || !isReady.value) return;
     _response = Completer<dynamic>();
     if (!isConnected.value) {
       onMagicLoginRequest.broadcast(MagicSessionEvent(email: email.value));

pubspec.yaml

@@ -1,6 +1,6 @@
 name: web3modal_flutter
 description: "WalletConnect Web3Modal: Simple, intuitive wallet login. With this drop-in UI SDK, enable any wallet's users to seamlessly log in to your app and enjoy a unified experience"
-version: 3.2.0-beta03
+version: 3.2.0-beta04
 repository: https://github.com/WalletConnect/Web3ModalFlutter
 
 environment: