Nostr Preferences

lib/bloc/app_blocs.dart

@@ -4,6 +4,7 @@ import 'package:breez/bloc/connect_pay/connect_pay_bloc.dart';
 import 'package:breez/bloc/fastbitcoins/fastbitcoins_bloc.dart';
 import 'package:breez/bloc/lnurl/lnurl_bloc.dart';
 import 'package:breez/bloc/marketplace/marketplace_bloc.dart';
+import 'package:breez/bloc/nostr/nostr_bloc.dart';
 import 'package:breez/bloc/payment_options/payment_options_bloc.dart';
 import 'package:breez/bloc/podcast_clip/podcast_clip_bloc.dart';
 import 'package:breez/bloc/podcast_history/podcast_history_bloc.dart';
@@ -26,6 +27,7 @@ class AppBlocs {
   final InvoiceBloc invoicesBloc;
   final ConnectPayBloc connectPayBloc;
   final BackupBloc backupBloc;
+  final NostrBloc nostrBloc;
   final MarketplaceBloc marketplaceBloc;
   final FastbitcoinsBloc fastbitcoinsBloc;
   final LSPBloc lspBloc;
@@ -72,8 +74,12 @@ class AppBlocs {
         ConnectPayBloc(userProfileBloc.userStream, accountBloc.accountStream,
             accountBloc.userActionsSink),
         blocsByType);
-    MarketplaceBloc marketplaceBloc =
-        _registerBloc(MarketplaceBloc(), blocsByType);
+    NostrBloc nostrBloc = _registerBloc(NostrBloc(), blocsByType);
+    MarketplaceBloc marketplaceBloc = _registerBloc(
+        MarketplaceBloc(
+          nostrBloc.nostrSettingsStream,
+        ),
+        blocsByType);
     LSPBloc lspBloc =
         _registerBloc(LSPBloc(accountBloc.accountStream), blocsByType);
     LNUrlBloc lnurlBloc = _registerBloc(LNUrlBloc(), blocsByType);
@@ -110,6 +116,7 @@ class AppBlocs {
         invoicesBloc,
         connectPayBloc,
         backupBloc,
+        nostrBloc,
         marketplaceBloc,
         fastbitcoinsBloc,
         lspBloc,
@@ -129,6 +136,7 @@ class AppBlocs {
       this.invoicesBloc,
       this.connectPayBloc,
       this.backupBloc,
+      this.nostrBloc,
       this.marketplaceBloc,
       this.fastbitcoinsBloc,
       this.lspBloc,

lib/bloc/marketplace/marketplace_bloc.dart

@@ -2,39 +2,27 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:breez/bloc/marketplace/vendor_model.dart';
+import 'package:breez/bloc/nostr/nostr_model.dart';
 import 'package:flutter/services.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'nostr_settings.dart';
-
 class MarketplaceBloc {
   final _vendorController = BehaviorSubject<List<VendorModel>>();
   Stream<List<VendorModel>> get vendorsStream => _vendorController.stream;
-
   bool _isSnortToggled;
+  SharedPreferences pref;
 
-  final _nostrSettingsController = BehaviorSubject<NostrSettings>();
-  Stream<NostrSettings> get nostrSettingsStream =>
-      _nostrSettingsController.stream;
-  Sink<NostrSettings> get nostrSettingsSettingsSink =>
-      _nostrSettingsController.sink;
-
-  MarketplaceBloc() {
+  MarketplaceBloc(Stream<NostrSettings> nostrSettingsStream) {
     loadVendors();
 
-    _listenNostrSettings();
-    _initNostrSettings();
-  }
-
-  _initNostrSettings() async {
-    _nostrSettingsController.add(NostrSettings.initial());
+    _listenNostrSettings(nostrSettingsStream);
   }
 
-  _listenNostrSettings() async {
-    SharedPreferences pref = await SharedPreferences.getInstance();
+  _listenNostrSettings(Stream<NostrSettings> nostrSettingsStream) async {
+    pref = await SharedPreferences.getInstance();
     nostrSettingsStream.listen((settings) async {
-      _isSnortToggled = settings.showSnort;
+      _isSnortToggled = settings.enableNostr;
       pref.setString(NostrSettings.NOSTR_SETTINGS_PREFERENCES_KEY,
           json.encode(settings.toJson()));
       await loadVendors();
@@ -48,6 +36,7 @@ class MarketplaceBloc {
     List<VendorModel> vendorList = vendorListFromJson(jsonVendors);
     if (_isSnortToggled) {
       vendorList.removeWhere((element) => element.displayName == "Snort");
+      vendorList.removeWhere((element) => element.displayName == "Primal");
       _vendorController.add(vendorList);
     } else {
       _vendorController.add(vendorListFromJson(jsonVendors));
@@ -57,6 +46,5 @@ class MarketplaceBloc {
 
   close() {
     _vendorController.close();
-    _nostrSettingsController.close();
   }
 }

lib/bloc/nostr/nostr_actions.dart

@@ -6,9 +6,10 @@ class GetPublicKey extends AsyncAction {
 
 class SignEvent extends AsyncAction {
   final Map<String, dynamic> eventObject;
-  final String privateKey;
 
-  SignEvent(this.eventObject, this.privateKey);
+  SignEvent(
+    this.eventObject,
+  );
 }
 
 class GetRelays extends AsyncAction {}
@@ -17,12 +18,36 @@ class Nip04Encrypt extends AsyncAction {
   final String data;
   final String publicKey;
 
-  Nip04Encrypt(this.data, this.publicKey);
+  Nip04Encrypt(
+    this.data,
+    this.publicKey,
+  );
 }
 
 class Nip04Decrypt extends AsyncAction {
   final String encryptedData;
+  final String publicKey;
+
+  Nip04Decrypt(
+    this.encryptedData,
+    this.publicKey,
+  );
+}
+
+class StoreImportedPrivateKey extends AsyncAction {
   final String privateKey;
+  StoreImportedPrivateKey({
+    this.privateKey,
+  });
+}
+
+class DeleteKey extends AsyncAction {
+  DeleteKey();
+}
 
-  Nip04Decrypt(this.encryptedData, this.privateKey);
+class PublishRelays extends AsyncAction {
+  final List<String> userRelayList;
+  PublishRelays({
+    this.userRelayList,
+  });
 }