diff --git a/lib/reactions/check_connection.dart b/lib/reactions/check_connection.dart
index 6b7b79941..9185ffe15 100644
--- a/lib/reactions/check_connection.dart
+++ b/lib/reactions/check_connection.dart
@@ -1,10 +1,9 @@
 import 'dart:async';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/sync_status.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:connectivity/connectivity.dart';
-
 Timer? _checkConnectionTimer;
 
 void startCheckConnectionReaction(
diff --git a/lib/src/screens/setup_2fa/setup_2fa_enter_code_page.dart b/lib/src/screens/setup_2fa/setup_2fa_enter_code_page.dart
index 49763a797..e88b1090b 100644
--- a/lib/src/screens/setup_2fa/setup_2fa_enter_code_page.dart
+++ b/lib/src/screens/setup_2fa/setup_2fa_enter_code_page.dart
@@ -43,26 +43,24 @@ class TotpAuthCodePageState extends State<TotpAuthCodePage> {
 
   @override
   void initState() {
-    _reaction ??= reaction((_) => widget.setup2FAViewModel.state, (ExecutionState state) {
-      if (state is ExecutedSuccessfullyState) {
+    if(widget.totpArguments.onTotpAuthenticationFinished != null) {
+      _reaction ??= reaction((_) => widget.setup2FAViewModel.state, (ExecutionState state) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
-          widget.totpArguments.onTotpAuthenticationFinished!(true, this);
-        });
-      }
+          if (state is ExecutedSuccessfullyState) {
+            widget.totpArguments.onTotpAuthenticationFinished!(true, this);
+          }
 
-      if (state is FailureState) {
-        print(state.error);
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          widget.totpArguments.onTotpAuthenticationFinished!(false, this);
-        });
-      }
+          if (state is FailureState) {
+            print(state.error);
+            widget.totpArguments.onTotpAuthenticationFinished!(false, this);
+          }
 
-      if (state is AuthenticationBanned) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          widget.totpArguments.onTotpAuthenticationFinished!(false, this);
-        });
-      }
+          if (state is AuthenticationBanned) {
+            widget.totpArguments.onTotpAuthenticationFinished!(false, this);
+          } 
+          });
     });
+    }
 
     super.initState();
   }
diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart
index 9dfdacd39..69e92d530 100644
--- a/lib/store/settings_store.dart
+++ b/lib/store/settings_store.dart
@@ -580,7 +580,6 @@ abstract class SettingsStoreBase with Store {
     if (Platform.isAndroid) {
       final androidInfo = await deviceInfoPlugin.androidInfo;
       deviceName = '${androidInfo.brand}%20${androidInfo.manufacturer}%20${androidInfo.model}';
-      print(deviceName);
     } else if (Platform.isIOS) {
       final iosInfo = await deviceInfoPlugin.iosInfo;
       deviceName = iosInfo.model;
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index c7f78b30f..c55241797 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,7 +5,7 @@
 import FlutterMacOS
 import Foundation
 
-import connectivity_macos
+import connectivity_plus_macos
 import cw_monero
 import device_info_plus
 import devicelocale
diff --git a/pubspec_base.yaml b/pubspec_base.yaml
index 73c835f4a..2c8908aea 100644
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@@ -56,8 +56,8 @@ dependencies:
   # password: ^1.0.0
   basic_utils: ^4.3.0
   get_it: ^7.2.0
-  connectivity: ^3.0.3
-  # connectivity_plus: ^2.3.5
+  # connectivity: ^3.0.3
+  connectivity_plus: ^2.3.5
   keyboard_actions: ^4.0.1
   another_flushbar: ^1.12.29
   archive: ^3.3.0