diff --git a/lib/anonpay/anonpay_api.dart b/lib/anonpay/anonpay_api.dart
index e46499407..acab662d1 100644
--- a/lib/anonpay/anonpay_api.dart
+++ b/lib/anonpay/anonpay_api.dart
@@ -20,7 +20,7 @@ class AnonPayApi {
   final WalletBase wallet;
 
   static const anonpayRef = secrets.anonPayReferralCode;
-  static const onionApiAuthority = 'trocadorfyhlu27aefre5u7zri66gudtzdyelymftvr4yjwcxhfaqsid.onion';
+  static const onionApiAuthority = 'tqzngtf2hybjbexznel6dhgsvbynjzezoybvtv6iofomx7gchqfssgqd.onion';
   static const clearNetAuthority = 'trocador.app';
   static const markup = secrets.trocadorExchangeMarkup;
   static const anonPayPath = '/anonpay';
diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart
index 306c41479..d9427af0a 100644
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@@ -40,11 +40,11 @@ class NewWalletPage extends BasePage {
 
   @override
   Function(BuildContext)? get pushToNextWidget => (context) {
-    FocusScopeNode currentFocus = FocusScope.of(context);
-    if (!currentFocus.hasPrimaryFocus) {
-      currentFocus.focusedChild?.unfocus();
-    }
-  };
+        FocusScopeNode currentFocus = FocusScope.of(context);
+        if (!currentFocus.hasPrimaryFocus) {
+          currentFocus.focusedChild?.unfocus();
+        }
+      };
 
   @override
   Widget body(BuildContext context) => WalletNameForm(
@@ -88,15 +88,17 @@ class _WalletNameFormState extends State<WalletNameForm> {
 
       if (state is FailureState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
-          showPopUp<void>(
-              context: context,
-              builder: (_) {
-                return AlertWithOneAction(
-                    alertTitle: S.current.new_wallet,
-                    alertContent: state.error,
-                    buttonText: S.of(context).ok,
-                    buttonAction: () => Navigator.of(context).pop());
-              });
+          if (context.mounted) {
+            showPopUp<void>(
+                context: context,
+                builder: (_) {
+                  return AlertWithOneAction(
+                      alertTitle: S.current.new_wallet,
+                      alertContent: state.error,
+                      buttonText: S.of(context).ok,
+                      buttonAction: () => Navigator.of(context).pop());
+                });
+          }
         });
       }
     });
diff --git a/lib/src/screens/subaddress/address_edit_or_create_page.dart b/lib/src/screens/subaddress/address_edit_or_create_page.dart
index e067c78d0..b69a6d8df 100644
--- a/lib/src/screens/subaddress/address_edit_or_create_page.dart
+++ b/lib/src/screens/subaddress/address_edit_or_create_page.dart
@@ -58,7 +58,7 @@ class AddressEditOrCreatePage extends BasePage {
                   isLoading:
                       addressEditOrCreateViewModel.state is AddressIsSaving,
                   isDisabled:
-                      addressEditOrCreateViewModel.label?.isEmpty ?? true,
+                      addressEditOrCreateViewModel.label.isEmpty,
                 ),
               )
             ],
@@ -74,7 +74,9 @@ class AddressEditOrCreatePage extends BasePage {
             (AddressEditOrCreateState state) {
           if (state is AddressSavedSuccessfully) {
             WidgetsBinding.instance
-                .addPostFrameCallback((_) => Navigator.of(context).pop());
+                .addPostFrameCallback((_) {
+                  if (context.mounted) Navigator.of(context).pop();
+                });
           }
         });
 
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 873d50649..338ece4ce 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -15,7 +15,7 @@ import in_app_review
 import package_info
 import package_info_plus
 import path_provider_foundation
-import share_plus_macos
+import share_plus
 import shared_preferences_foundation
 import url_launcher_macos
 import wakelock_plus
diff --git a/pubspec_base.yaml b/pubspec_base.yaml
index 84b4631fc..463c04988 100644
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@@ -21,7 +21,7 @@ dependencies:
   mobx: ^2.1.4
   flutter_mobx: ^2.0.6+5
   flutter_slidable: ^3.0.1
-  share_plus: ^4.0.10
+  share_plus: ^10.0.0
   # date_range_picker: ^1.0.6
   #https://api.flutter.dev/flutter/material/showDateRangePicker.html
   dio: ^4.0.6
diff --git a/scripts/macos/build_all.sh b/scripts/macos/build_all.sh
index 4116704bf..030617f7d 100755
--- a/scripts/macos/build_all.sh
+++ b/scripts/macos/build_all.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-./build_monero_all.sh
\ No newline at end of file
+./build_monero_all.sh universal
\ No newline at end of file
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 323f53c9f..c6444e09c 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -10,6 +10,7 @@
 #include <flutter_local_authentication/flutter_local_authentication_plugin_c_api.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
+#include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
@@ -21,6 +22,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
+  SharePlusWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index d6d9b0a49..0a0b2f9eb 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -7,6 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_local_authentication
   flutter_secure_storage_windows
   permission_handler_windows
+  share_plus
   url_launcher_windows
 )