feat(ardrive auth): moves the getWalletAddress out of the login bloc …

…PE-4752
ardriveapp · Oct 9, 2023 · 7f29329 · 7f29329
1 parent ffeeea0
commit 7f29329
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/lib/authentication/ardrive_auth.dart b/lib/authentication/ardrive_auth.dart
@@ -12,6 +12,7 @@ import 'package:ardrive/utils/logger/logger.dart';
 import 'package:ardrive/utils/metadata_cache.dart';
 import 'package:ardrive/utils/secure_key_value_store.dart';
 import 'package:arweave/arweave.dart';
+import 'package:arweave/utils.dart';
 import 'package:cryptography/cryptography.dart';
 import 'package:flutter/foundation.dart';
 import 'package:stash_shared_preferences/stash_shared_preferences.dart';
@@ -29,6 +30,7 @@ abstract class ArDriveAuth {
   User get currentUser;
   Stream<User?> onAuthStateChanged();
   Future<bool> isBiometricsEnabled();
+  Future<String?> getWalletAddress();
 
   factory ArDriveAuth({
     required ArweaveService arweave,
@@ -326,6 +328,15 @@ class ArDriveAuthImpl implements ArDriveAuth {
 
     return firstPrivateDriveTxId;
   }
+
+  @override
+  Future<String?> getWalletAddress() async {
+    final owner = await _userRepository.getOwnerOfDefaultProfile();
+    if (owner == null) {
+      return null;
+    }
+    return ownerToAddress(owner);
+  }
 }
 
 class AuthenticationFailedException implements Exception {

diff --git a/lib/authentication/login/blocs/login_bloc.dart b/lib/authentication/login/blocs/login_bloc.dart
@@ -11,7 +11,6 @@ import 'package:ardrive/utils/html/html_util.dart';
 import 'package:ardrive/utils/logger/logger.dart';
 import 'package:ardrive_io/ardrive_io.dart';
 import 'package:arweave/arweave.dart';
-import 'package:arweave/utils.dart';
 import 'package:bip39/bip39.dart' as bip39;
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
@@ -27,7 +26,6 @@ part 'login_state.dart';
 class LoginBloc extends Bloc<LoginEvent, LoginState> {
   final ArDriveAuth _arDriveAuth;
   final ArConnectService _arConnectService;
-  final UserRepository _userRepository;
 
   bool ignoreNextWaletSwitch = false;
 
@@ -37,21 +35,12 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   @visibleForTesting
   ProfileType? profileType;
 
-  Future<String?> getWalletAddress() async {
-    final owner = await _userRepository.getOwnerOfDefaultProfile();
-    if (owner == null) {
-      return null;
-    }
-    return ownerToAddress(owner);
-  }
-
   LoginBloc({
     required ArDriveAuth arDriveAuth,
     required ArConnectService arConnectService,
     required UserRepository userRepository,
   })  : _arDriveAuth = arDriveAuth,
         _arConnectService = arConnectService,
-        _userRepository = userRepository,
         super(LoginLoading()) {
     on<LoginEvent>(_onLoginEvent);
     _listenToWalletChange();

diff --git a/lib/authentication/login/views/login_page.dart b/lib/authentication/login/views/login_page.dart
@@ -690,7 +690,7 @@ class _PromptPasswordViewState extends State<PromptPasswordView> {
                 style: ArDriveTypography.headline.headline4Bold(),
               ),
               FutureBuilder(
-                future: context.read<LoginBloc>().getWalletAddress(),
+                future: context.read<ArDriveAuth>().getWalletAddress(),
                 builder:
                     (BuildContext context, AsyncSnapshot<String?> snapshot) {
                   if (snapshot.hasData) {