fix: seed vault notification stream, account filter for parsed seeds (#…

…859)
espresso-cash · Mar 2, 2023 · 733c588 · 733c588
1 parent 907c690
commit 733c588
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/packages/solana_seed_vault/lib/src/extensions.dart b/packages/solana_seed_vault/lib/src/extensions.dart
@@ -11,15 +11,22 @@ import 'package:solana_seed_vault/src/seed_vault.dart';
 import 'package:solana_seed_vault/src/wallet_contract_v1.dart';
 
 extension SeedVaultHelperExt on SeedVault {
-  Future<List<Seed>> getParsedAuthorizedSeeds() async {
+  Future<List<Seed>> getParsedAuthorizedSeeds({
+    AccountFilter accountFilter = const AccountFilter(),
+  }) async {
     final result = await getAuthorizedSeeds();
 
-    return result.map((it) => it.cursorToSeed(this)).let(Future.wait);
+    return result
+        .map((it) => it.cursorToSeed(this, accountFilter))
+        .let(Future.wait);
   }
 
-  Future<Seed> getParsedAuthorizedSeed(AuthToken authToken) =>
+  Future<Seed> getParsedAuthorizedSeed(
+    AuthToken authToken, {
+    AccountFilter accountFilter = const AccountFilter(),
+  }) =>
       getAuthorizedSeed(authToken: authToken)
-          .letAsync((it) => it.cursorToSeed(this));
+          .letAsync((it) => it.cursorToSeed(this, accountFilter));
 
   Future<List<Account>> getParsedAccounts(
     AuthToken authToken, {
@@ -46,13 +53,13 @@ extension SeedVaultHelperExt on SeedVault {
 }
 
 extension CursorToModelExt on CursorData {
-  Future<Seed> cursorToSeed(SeedVault seedVault) async {
+  Future<Seed> cursorToSeed(SeedVault seedVault, AccountFilter filter) async {
     final authToken = this[WalletContractV1.authorizedSeedsAuthToken] as int;
     final name = this[WalletContractV1.authorizedSeedsSeedName] as String;
     final purpose = this[WalletContractV1.authorizedSeedsAuthPurpose] as int;
     final accounts = await seedVault.getParsedAccounts(
       authToken,
-      filter: const AccountFilter.byIsUserWallet(true),
+      filter: filter,
     );
 
     return Seed(

diff --git a/packages/solana_seed_vault/lib/src/seed_vault.dart b/packages/solana_seed_vault/lib/src/seed_vault.dart
@@ -33,7 +33,7 @@ class SeedVault implements SeedVaultFlutterApi {
   @visibleForTesting
   static set instance(SeedVault vault) => _instance = vault;
 
-  final _eventStream = StreamController<SeedVaultNotification>();
+  final _eventStream = StreamController<SeedVaultNotification>.broadcast();
 
   @override
   void onChangeNotified(List<String?> uris, int flags) {