From 26982ed6abb51ae13be0fec03a4e5405597d67ab Mon Sep 17 00:00:00 2001 From: Alfreedom <00tango.bromine@icloud.com> Date: Fri, 5 Apr 2024 11:24:29 +0200 Subject: [PATCH] minor fix and version up --- .github/workflows/build-android-debug.yml | 6 +++--- .github/workflows/build-android-internal.yml | 2 +- .github/workflows/build-android.yml | 2 +- .github/workflows/build-ios-debug.yml | 6 +++--- .github/workflows/build-ios-internal.yml | 2 +- .github/workflows/build-ios.yml | 2 +- CHANGELOG.md | 2 +- example/android/gradle.properties | 2 +- example/ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ example/ios/Runner/Info.plist | 2 +- example/pubspec.lock | 2 +- lib/services/magic_service/magic_service.dart | 11 ++++++++++- lib/version.dart | 2 +- pubspec.yaml | 2 +- 14 files changed, 32 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build-android-debug.yml b/.github/workflows/build-android-debug.yml index cbfaca9e..851929c7 100644 --- a/.github/workflows/build-android-debug.yml +++ b/.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: diff --git a/.github/workflows/build-android-internal.yml b/.github/workflows/build-android-internal.yml index d988ed7d..f0d49dbe 100644 --- a/.github/workflows/build-android-internal.yml +++ b/.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: diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 3c574114..d8627da1 100644 --- a/.github/workflows/build-android.yml +++ b/.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: diff --git a/.github/workflows/build-ios-debug.yml b/.github/workflows/build-ios-debug.yml index e24b476f..116c49a5 100644 --- a/.github/workflows/build-ios-debug.yml +++ b/.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: diff --git a/.github/workflows/build-ios-internal.yml b/.github/workflows/build-ios-internal.yml index f8deba00..059982d4 100644 --- a/.github/workflows/build-ios-internal.yml +++ b/.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: diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 7e684005..a1dc4d4b 100644 --- a/.github/workflows/build-ios.yml +++ b/.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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 699a558e..908c1275 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 3.2.0-beta03 +## 3.2.0-beta04 - Email Login support - Analytics API support diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 044d295e..ae8c87a7 100644 --- a/example/android/gradle.properties +++ b/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 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index fc8c676a..189a9be8 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/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; diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index 9dc66b44..8c907f26 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -36,7 +36,7 @@ CFBundleVersion - 46 + 47 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/example/pubspec.lock b/example/pubspec.lock index 35e6008f..d5ff2135 100644 --- a/example/pubspec.lock +++ b/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: diff --git a/lib/services/magic_service/magic_service.dart b/lib/services/magic_service/magic_service.dart index 27923380..c02d9344 100644 --- a/lib/services/magic_service/magic_service.dart +++ b/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(); + 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 _rpcRequest(Map parameters) async { - if (!isEnabled.value || !isReady.value) return; _response = Completer(); if (!isConnected.value) { onMagicLoginRequest.broadcast(MagicSessionEvent(email: email.value)); diff --git a/lib/version.dart b/lib/version.dart index f4cc0945..587f6fa6 100644 --- a/lib/version.dart +++ b/lib/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '3.2.0-beta03'; +const packageVersion = '3.2.0-beta04'; diff --git a/pubspec.yaml b/pubspec.yaml index 45e7e96e..84e1d393 100644 --- a/pubspec.yaml +++ b/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: