diff --git a/auth/lib/services/billing_service.dart b/auth/lib/services/billing_service.dart
index 926a11e4d92808052baef5d0fb0c2f33d2629cf3..363425cd53bb78823e488274274a1793cf30a062 100644
--- a/auth/lib/services/billing_service.dart
+++ b/auth/lib/services/billing_service.dart
@@ -28,8 +28,6 @@ class BillingService {
   final _dio = Network.instance.getDio();
   final _config = Configuration.instance;
 
-  bool _isOnSubscriptionPage = false;
-
   Subscription? _cachedSubscription;
 
   Future<BillingPlans>? _future;
@@ -176,8 +174,4 @@ class BillingService {
       rethrow;
     }
   }
-
-  void setIsOnSubscriptionPage(bool isOnSubscriptionPage) {
-    _isOnSubscriptionPage = isOnSubscriptionPage;
-  }
 }
diff --git a/auth/lib/store/user_store.dart b/auth/lib/store/user_store.dart
index 30409671b34c33d109268820c040bf34a2f9c57f..20f3ead72b5b76aacd842282a0074223e7fa0a33 100644
--- a/auth/lib/store/user_store.dart
+++ b/auth/lib/store/user_store.dart
@@ -3,6 +3,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 class UserStore {
   UserStore._privateConstructor();
 
+  // ignore: unused_field
   late SharedPreferences _preferences;
 
   static final UserStore instance = UserStore._privateConstructor();
diff --git a/auth/lib/ui/account/recovery_page.dart b/auth/lib/ui/account/recovery_page.dart
index 762bb1a6c6ae7cd0dae6d56810110819d0aa6ba3..1d55fbb536c2704a95a9b458030c9c51d05fbb9e 100644
--- a/auth/lib/ui/account/recovery_page.dart
+++ b/auth/lib/ui/account/recovery_page.dart
@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/ui/account/password_entry_page.dart';
diff --git a/auth/lib/ui/account/verify_recovery_page.dart b/auth/lib/ui/account/verify_recovery_page.dart
index e4b3fbdb22be42d6105f9666ee284bba4cda4b5f..146f3ea9224ecff2198ca68965e4dfb926cb846a 100644
--- a/auth/lib/ui/account/verify_recovery_page.dart
+++ b/auth/lib/ui/account/verify_recovery_page.dart
@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:bip39/bip39.dart' as bip39;
 import 'package:dio/dio.dart';
 import 'package:ente_auth/core/configuration.dart';
diff --git a/auth/lib/ui/passkey_page.dart b/auth/lib/ui/passkey_page.dart
index 6efc234741d9aefd16a18b4e50671d94505df6bb..5b4cbf18d1ec81dc6665a251f2a4e269e845af9d 100644
--- a/auth/lib/ui/passkey_page.dart
+++ b/auth/lib/ui/passkey_page.dart
@@ -1,12 +1,12 @@
 import 'dart:convert';
 
+import 'package:app_links/app_links.dart';
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/ente_theme_data.dart';
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/services/user_service.dart';
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
-import 'package:uni_links/uni_links.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 class PasskeyPage extends StatefulWidget {
@@ -14,8 +14,8 @@ class PasskeyPage extends StatefulWidget {
 
   const PasskeyPage(
     this.sessionID, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<PasskeyPage> createState() => _PasskeyPageState();
@@ -61,8 +61,9 @@ class _PasskeyPageState extends State<PasskeyPage> {
   }
 
   Future<bool> _initDeepLinks() async {
+    final appLinks = AppLinks();
     // Attach a listener to the stream
-    linkStream.listen(
+    appLinks.stringLinkStream.listen(
       _handleDeeplink,
       onError: (err) {
         _logger.severe(err);
diff --git a/auth/lib/ui/settings/data/import/plain_text_import.dart b/auth/lib/ui/settings/data/import/plain_text_import.dart
index 9681f3c1a5c78c62f8d3bcc262f106950e088481..d76effd8c4fbc649968555266dd0339ea0b4d337 100644
--- a/auth/lib/ui/settings/data/import/plain_text_import.dart
+++ b/auth/lib/ui/settings/data/import/plain_text_import.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+import 'dart:ui';
 
 import 'package:ente_auth/ente_theme_data.dart';
 import 'package:ente_auth/l10n/l10n.dart';
diff --git a/auth/lib/ui/tools/debug/log_file_viewer.dart b/auth/lib/ui/tools/debug/log_file_viewer.dart
index bcee33bc21da3faa8426b0e04c713833145f18ed..2a85969ed435612f9e17bd7a9cdbebb386cdb903 100644
--- a/auth/lib/ui/tools/debug/log_file_viewer.dart
+++ b/auth/lib/ui/tools/debug/log_file_viewer.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'dart:ui';
 
 import 'package:ente_auth/ui/common/loading_widget.dart';
 import 'package:ente_auth/utils/platform_util.dart';
diff --git a/auth/lib/ui/two_factor_recovery_page.dart b/auth/lib/ui/two_factor_recovery_page.dart
index 12ace414fe4dda591e63463972c4f39a030845e3..c8a8b1aa6168416d2d26986ebcaee41c1b3826a7 100644
--- a/auth/lib/ui/two_factor_recovery_page.dart
+++ b/auth/lib/ui/two_factor_recovery_page.dart
@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/utils/dialog_util.dart';