Merge pull request #124 from WalletConnect/chores/email_login_bug_fixes

[Email Wallets] minor bug fixes

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 3.2.0-beta06
+## 3.2.0-beta07
 
 - 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=55
+versionCode=56

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 = 55;
+				CURRENT_PROJECT_VERSION = 56;
 				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 = 55;
+				CURRENT_PROJECT_VERSION = 56;
 				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 = 55;
+				CURRENT_PROJECT_VERSION = 56;
 				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 = 55;
+				CURRENT_PROJECT_VERSION = 56;
 				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 = 55;
+				CURRENT_PROJECT_VERSION = 56;
 				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 = 55;
+				CURRENT_PROJECT_VERSION = 56;
 				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>55</string>
+	<string>56</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

example/lib/utils/crypto/eip155.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:math';
 import 'package:intl/intl.dart';
 import 'package:web3modal_flutter/web3modal_flutter.dart';
 
@@ -127,6 +128,7 @@ class EIP155 {
               '0x59e2f66C0E96803206B6486cDb39029abAE834c0',
             ),
             value: EtherAmount.fromInt(EtherUnit.finney, 11), // == 0.011
+            nonce: Random().nextInt(10000),
           ),
         );
       case EIP155UIMethods.walletWatchAsset:

example/pubspec.lock

@@ -1139,7 +1139,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "3.2.0-beta06"
+    version: "3.2.0-beta07"
   web_socket_channel:
     dependency: transitive
     description:

lib/pages/approve_magic_request_page.dart

@@ -22,9 +22,7 @@ class _ApproveTransactionPageState extends State<ApproveTransactionPage> {
       noClose: true,
       safeAreaLeft: true,
       safeAreaRight: true,
-      body: SafeArea(
-        child: magicService.instance.webview,
-      ),
+      body: magicService.instance.webview,
     );
   }
 }

lib/pages/confirm_email_page.dart

@@ -31,7 +31,7 @@ class _ConfirmEmailPageState extends State<ConfirmEmailPage> {
   @override
   void dispose() {
     magicService.instance.onMagicError.unsubscribe(_onMagicErrorEvent);
-    _dispose();
+    magicService.instance.step.value = EmailLoginStep.idle;
     super.dispose();
   }
 
@@ -47,13 +47,9 @@ class _ConfirmEmailPageState extends State<ConfirmEmailPage> {
     }
   }
 
-  void _dispose() {
-    magicService.instance.setEmail('');
-    magicService.instance.step.value = EmailLoginStep.idle;
-  }
-
   void _goBack() {
-    _dispose();
+    magicService.instance.step.value = EmailLoginStep.idle;
+    magicService.instance.setEmail('');
     FocusManager.instance.primaryFocus?.unfocus();
     widgetStack.instance.pop();
   }

lib/services/magic_service/i_magic_service.dart

@@ -21,7 +21,7 @@ abstract class IMagicService {
     String? chainId,
     required SessionRequestParams request,
   });
-  Future<dynamic> disconnect();
+  Future<bool> disconnect();
 
   abstract final Event<MagicSessionEvent> onMagicLoginRequest;
   abstract final Event<MagicLoginEvent> onMagicLoginSuccess;

lib/services/magic_service/magic_service.dart

@@ -38,7 +38,6 @@ class MagicService implements IMagicService {
     'wallet_addEthereumChain',
   ];
   //
-  // late final Key _key;
   final IWeb3App _web3app;
   Web3ModalTheme? _currentTheme;
   Timer? _timeOutTimer;
@@ -55,7 +54,7 @@ class MagicService implements IMagicService {
   late Completer<bool> _initialized;
   late Completer<bool> _connected;
   late Completer<dynamic> _response;
-  late Completer<dynamic> _disconnect;
+  late Completer<bool> _disconnect;
 
   @override
   Event<MagicSessionEvent> onMagicLoginRequest = Event<MagicSessionEvent>();
@@ -84,17 +83,11 @@ class MagicService implements IMagicService {
   final newEmail = ValueNotifier<String>('');
   final step = ValueNotifier<EmailLoginStep>(EmailLoginStep.idle);
 
-  MagicService({
-    required IWeb3App web3app,
-    bool enabled = false,
-    // Key? key,
-  }) : _web3app = web3app //,
-  // _key = key ?? Key('magic_service')
-  {
+  MagicService({required IWeb3App web3app, bool enabled = false})
+      : _web3app = web3app {
     isEnabled.value = enabled;
     if (isEnabled.value) {
       _webViewController = WebViewController();
-      // key: Key('${_key.hashCode}'),
       _webview = WebViewWidget(controller: _webViewController);
       isReady.addListener(_readyListener);
     }
@@ -291,17 +284,17 @@ class MagicService implements IMagicService {
   }
 
   @override
-  Future<dynamic> disconnect() async {
-    if (!isEnabled.value || !isReady.value) return;
-    _disconnect = Completer<dynamic>();
+  Future<bool> disconnect() async {
+    if (!isEnabled.value || !isReady.value) return false;
+    _disconnect = Completer<bool>();
     if (!isConnected.value) {
       _resetTimeOut();
       _disconnect.complete(true);
-      return await _disconnect.future;
+      return (await _disconnect.future);
     }
     final message = SignOut().toString();
     await _webViewController.runJavaScript('sendW3Message($message)');
-    return await _disconnect.future;
+    return (await _disconnect.future);
   }
 
   // ****** Private Methods ******* //
@@ -546,12 +539,12 @@ class MagicService implements IMagicService {
       const iframeFL = document.getElementById('frame-mobile-sdk')
       
       window.addEventListener('message', ({ data, origin }) => {
-        // console.log('w3mMessage received <=== ' + JSON.stringify({data,origin}))
+        console.log('w3mMessage received <=== ' + JSON.stringify({data,origin}))
         window.w3mWebview.postMessage(JSON.stringify({data,origin}))
       })
 
       const sendW3Message = async (message) => {
-        // console.log('w3mMessage posted =====> ' + JSON.stringify(message))
+        console.log('w3mMessage posted =====> ' + JSON.stringify(message))
         iframeFL.contentWindow.postMessage(message, '*')
       }
 

lib/services/w3m_service/w3m_service.dart

@@ -216,8 +216,12 @@ class W3MService with ChangeNotifier, CoinbaseService implements IW3MService {
         _currentSelectedChain = W3MChainPresets.chains[chainId];
         await _setSesionAndChainData(_currentSession!);
       }
+      if (_currentSession!.sessionService.isMagic) {
+        await magicService.instance.init();
+      }
+    } else {
+      magicService.instance.init();
     }
-    await magicService.instance.init();
 
     await expirePreviousInactivePairings();
 
@@ -243,24 +247,20 @@ class W3MService with ChangeNotifier, CoinbaseService implements IW3MService {
       }
     } else {
       // Check for other type of sessions stored
-      // final storedSession = await _getStoredSession();
       if (_currentSession != null) {
         if (_currentSession!.sessionService.isCoinbase) {
           final isCbConnected = await cbIsConnected();
           if (!isCbConnected) {
             await _cleanSession();
           }
         } else if (_currentSession!.sessionService.isMagic) {
-          // Every time the app gets killed MAgic service will treat the user as disconnected
+          // Every time the app gets killed Magic service will treat the user as disconnected
           // So we will need to treat magic session differently
-          // await _storeSession(storedSession);
           final email = _currentSession!.email;
           magicService.instance.setEmail(email);
         } else {
           await _cleanSession();
         }
-      } else {
-        magicService.instance.disconnect();
       }
     }
 
@@ -764,6 +764,7 @@ class W3MService with ChangeNotifier, CoinbaseService implements IW3MService {
 
     _status = W3MServiceStatus.initializing;
     _notify();
+
     if (_currentSession?.sessionService.isCoinbase == true) {
       try {
         await cbResetSession();

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-beta06
+version: 3.2.0-beta07
 repository: https://github.com/WalletConnect/Web3ModalFlutter
 
 environment: