chore: bump version

closes #10

.github/workflows/build.yml

@@ -1,5 +1,7 @@
 name: build
-on: push
+on:
+  push:
+    branches: ["main"]
 jobs:
   android:
     runs-on: ubuntu-latest
@@ -12,7 +14,19 @@ jobs:
           channel: stable
       - run: flutter pub get
       - run: flutter build appbundle
+        env:
+          KEYSTORE: ${{ secrets.KEYSTORE }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          KEYSTORE_SHA256: ${{ secrets.KEYSTORE_SHA256 }}
       - run: flutter build apk --split-per-abi
+        env:
+          KEYSTORE: ${{ secrets.KEYSTORE }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          KEYSTORE_SHA256: ${{ secrets.KEYSTORE_SHA256 }}
       - uses: actions/upload-artifact@v4
         with:
           name: "release.aab"

lib/login.dart

@@ -6,6 +6,7 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:ndk/domain_layer/entities/account.dart';
 import 'package:ndk/shared/nips/nip01/bip340.dart';
 import 'package:ndk/shared/nips/nip19/nip19.dart';
+import 'package:zap_stream_flutter/utils.dart';
 
 class LoginAccount {
   final AccountType type;
@@ -15,12 +16,15 @@ class LoginAccount {
   LoginAccount._({required this.type, required this.pubkey, this.privateKey});
 
   static LoginAccount nip19(String key) {
-    final keyData = Nip19.decode(key);
+    final keyData = bech32ToHex(key);
     final pubkey =
         Nip19.isKey("nsec", key) ? Bip340.getPublicKey(keyData) : keyData;
     final privateKey = Nip19.isKey("npub", key) ? null : keyData;
     return LoginAccount._(
-      type: Nip19.isKey("npub", key) ? AccountType.publicKey : AccountType.privateKey,
+      type:
+          Nip19.isKey("npub", key)
+              ? AccountType.publicKey
+              : AccountType.privateKey,
       pubkey: pubkey,
       privateKey: privateKey,
     );
@@ -46,6 +50,15 @@ class LoginAccount {
 
   static LoginAccount? fromJson(Map<String, dynamic> json) {
     if (json.length > 2 && json.containsKey("pubKey")) {
+      if ((json["pubKey"] as String).length != 64) {
+        throw "Invalid pubkey, length != 64";
+      }
+      if (json.containsKey("privateKey")) {
+        final privKey = json["privateKey"] as String?;
+        if (privKey != null && privKey.length != 64) {
+          throw "Invalid privateKey, length != 64";
+        }
+      }
       return LoginAccount._(
         type: AccountType.values.firstWhere(
           (v) => v.toString().endsWith(json["type"] as String),
@@ -64,14 +77,17 @@ class LoginData extends ValueNotifier<LoginAccount?> {
 
   LoginData() : super(null) {
     super.addListener(() async {
-      final data = json.encode(LoginAccount.toJson(value));
-      await _storage.write(key: _storageKey, value: data);
+      if (value != null) {
+        final data = json.encode(LoginAccount.toJson(value));
+        await _storage.write(key: _storageKey, value: data);
+      } else {
+        await _storage.delete(key: _storageKey);
+      }
     });
   }
 
-  Future<void> logout() async {
+  void logout() {
     super.value = null;
-    await _storage.delete(key: _storageKey);
   }
 
   Future<void> load() async {

lib/main.dart

@@ -27,14 +27,21 @@ class NoVerify extends EventVerifier {
 
 final ndkCache = DbObjectBox();
 final eventVerifier = kDebugMode ? NoVerify() : RustEventVerifier();
-var ndk = Ndk(NdkConfig(eventVerifier: eventVerifier, cache: ndkCache, bootstrapRelays: defaultRelays));
+var ndk = Ndk(
+  NdkConfig(
+    eventVerifier: eventVerifier,
+    cache: ndkCache,
+    bootstrapRelays: defaultRelays,
+    //engine: NdkEngine.JIT,
+  ),
+);
 
 const userAgent = "zap.stream/1.0";
 const defaultRelays = [
   "wss://nos.lol",
   "wss://relay.damus.io",
   "wss://relay.primal.net",
-  "wss://relay.snort.social"
+  "wss://relay.snort.social",
 ];
 const searchRelays = ["wss://relay.nostr.band", "wss://search.nos.today"];
 

lib/pages/home.dart

@@ -16,6 +16,7 @@ class HomePage extends StatelessWidget {
           children: [
             HeaderWidget(),
             RxFilter<Nip01Event>(
+              Key("home-page"),
               filters: [
                 Filter(kinds: [30_311], limit: 50),
               ],

lib/pages/login.dart

@@ -1,10 +1,10 @@
 import 'package:amberflutter/amberflutter.dart';
 import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ndk/shared/nips/nip19/nip19.dart';
 import 'package:zap_stream_flutter/login.dart';
 import 'package:zap_stream_flutter/main.dart';
 import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
 import 'package:zap_stream_flutter/widgets/button.dart';
 
 class LoginPage extends StatelessWidget {
@@ -24,9 +24,11 @@ class LoginPage extends StatelessWidget {
                   final amber = Amberflutter();
                   final result = await amber.getPublicKey();
                   if (result['signature'] != null) {
-                    final key = Nip19.decode(result['signature']);
+                    final key = bech32ToHex(result['signature']);
                     loginData.value = LoginAccount.externalPublicKeyHex(key);
-                    ctx.go("/");
+                    if (ctx.mounted) {
+                      ctx.go("/");
+                    }
                   }
                 },
               );

lib/pages/login_input.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ndk/shared/nips/nip19/nip19.dart';
 import 'package:zap_stream_flutter/login.dart';
 import 'package:zap_stream_flutter/main.dart';
 import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
 import 'package:zap_stream_flutter/widgets/button.dart';
 
 class LoginInputPage extends StatefulWidget {
@@ -30,7 +30,7 @@ class _LoginInputPage extends State<LoginInputPage> {
           "Login",
           onTap: () async {
             try {
-              final keyData = Nip19.decode(_controller.text);
+              final keyData = bech32ToHex(_controller.text);
               if (keyData.isNotEmpty) {
                 loginData.value = LoginAccount.nip19(_controller.text);
                 context.go("/");

lib/pages/new_account.dart

@@ -99,7 +99,9 @@ class _NewAccountPage extends State<NewAccountPage> {
                   loginData.value = LoginAccount.privateKeyHex(
                     _privateKey.privateKey!,
                   );
-                  context.go("/");
+                  if (context.mounted) {
+                    context.go("/");
+                  }
                 })
                 .catchError((e) {
                   setState(() {

lib/pages/profile.dart

@@ -2,11 +2,11 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
 import 'package:ndk/ndk.dart';
-import 'package:ndk/shared/nips/nip19/nip19.dart';
 import 'package:zap_stream_flutter/imgproxy.dart';
 import 'package:zap_stream_flutter/main.dart';
 import 'package:zap_stream_flutter/rx_filter.dart';
 import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
 import 'package:zap_stream_flutter/widgets/avatar.dart';
 import 'package:zap_stream_flutter/widgets/button.dart';
 import 'package:zap_stream_flutter/widgets/header.dart';
@@ -20,7 +20,7 @@ class ProfilePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final hexPubkey = Nip19.decode(pubkey);
+    final hexPubkey = bech32ToHex(pubkey);
     return ProfileLoaderWidget(hexPubkey, (ctx, state) {
       final profile = state.data ?? Metadata(pubKey: hexPubkey);
       return SingleChildScrollView(
@@ -81,7 +81,7 @@ class ProfilePage extends StatelessWidget {
             ),
 
             RxFilter<Nip01Event>(
-              key: Key("profile-streams:$hexPubkey"),
+              Key("profile-streams:$hexPubkey"),
               relays: defaultRelays,
               filters: [
                 Filter(kinds: [30_311], limit: 200, pTags: [hexPubkey]),

lib/pages/stream.dart

@@ -1,10 +1,12 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:chewie/chewie.dart';
 import 'package:flutter/material.dart';
+import 'package:ndk/ndk.dart';
 import 'package:video_player/video_player.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
 import 'package:zap_stream_flutter/imgproxy.dart';
 import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/rx_filter.dart';
 import 'package:zap_stream_flutter/theme.dart';
 import 'package:zap_stream_flutter/utils.dart';
 import 'package:zap_stream_flutter/widgets/button.dart';
@@ -72,6 +74,24 @@ class _StreamPage extends State<StreamPage> {
 
   @override
   Widget build(BuildContext context) {
+    return RxFilter<Nip01Event>(
+      Key("stream:event:${widget.stream.aTag}"),
+      relays: widget.stream.info.relays,
+      filters: [
+        Filter(
+          kinds: [widget.stream.event.kind],
+          authors: [widget.stream.event.pubKey],
+          dTags: [widget.stream.event.getDtag()!],
+        ),
+      ],
+      builder: (ctx, state) {
+        final stream = StreamEvent(state?.firstOrNull ?? widget.stream.event);
+        return _buildStream(context, stream);
+      },
+    );
+  }
+
+  Widget _buildStream(BuildContext context, StreamEvent stream) {
     return Column(
       spacing: 4,
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -84,24 +104,21 @@ class _StreamPage extends State<StreamPage> {
                   : Container(
                     color: LAYER_1,
                     child:
-                        (widget.stream.info.image?.isNotEmpty ?? false)
+                        (stream.info.image?.isNotEmpty ?? false)
                             ? CachedNetworkImage(
-                              imageUrl: proxyImg(
-                                context,
-                                widget.stream.info.image!,
-                              ),
+                              imageUrl: proxyImg(context, stream.info.image!),
                             )
                             : null,
                   ),
         ),
         Text(
-          widget.stream.info.title ?? "",
+          stream.info.title ?? "",
           style: TextStyle(fontWeight: FontWeight.w600, fontSize: 18),
         ),
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            ProfileWidget.pubkey(widget.stream.info.host),
+            ProfileWidget.pubkey(stream.info.host),
             Row(
               spacing: 8,
               children: [
@@ -118,18 +135,25 @@ class _StreamPage extends State<StreamPage> {
                       constraints: BoxConstraints.expand(),
                       builder: (ctx) {
                         return ZapWidget(
-                          pubkey: widget.stream.info.host,
-                          target: widget.stream.event,
+                          pubkey: stream.info.host,
+                          target: stream.event,
+                          zapTags:
+                              // tag goal onto zap request
+                              stream.info.goal != null
+                                  ? [
+                                    ["e", stream.info.goal!],
+                                  ]
+                                  : null,
                         );
                       },
                     );
                   },
                 ),
-                if (widget.stream.info.participants != null)
+                if (stream.info.participants != null)
                   PillWidget(
                     color: LAYER_1,
                     child: Text(
-                      "${widget.stream.info.participants} viewers",
+                      "${stream.info.participants} viewers",
                       style: TextStyle(
                         fontSize: 12,
                         fontWeight: FontWeight.w500,
@@ -140,7 +164,7 @@ class _StreamPage extends State<StreamPage> {
             ),
           ],
         ),
-        Expanded(child: ChatWidget(stream: widget.stream)),
+        Expanded(child: ChatWidget(stream: stream)),
       ],
     );
   }

lib/rx_filter.dart

@@ -14,14 +14,14 @@ class RxFilter<T> extends StatefulWidget {
   final T Function(Nip01Event)? mapper;
   final List<String>? relays;
 
-  const RxFilter({
-    super.key,
+  const RxFilter(
+    Key key, {
     required this.filters,
     required this.builder,
     this.mapper,
     this.leaveOpen = true,
     this.relays,
-  });
+  }) : super(key: key);
 
   @override
   State<StatefulWidget> createState() => _RxFilter<T>();
@@ -37,8 +37,6 @@ class _RxFilter<T> extends State<RxFilter<T>> {
     developer.log("RX:SEDNING ${widget.filters}");
     _response = ndk.requests.subscription(
       filters: widget.filters,
-      cacheRead: true,
-      cacheWrite: true,
       explicitRelays: widget.relays,
     );
     if (!widget.leaveOpen) {
@@ -55,7 +53,6 @@ class _RxFilter<T> extends State<RxFilter<T>> {
         })
         .listen((events) {
           setState(() {
-            _events ??= HashMap();
             developer.log(
               "RX:GOT ${events.length} events for ${widget.filters}",
             );
@@ -66,9 +63,10 @@ class _RxFilter<T> extends State<RxFilter<T>> {
 
   void _replaceInto(Nip01Event ev) {
     final evKey = _eventKey(ev);
-    final existing = _events?[evKey];
+    _events ??= HashMap();
+    final existing = _events![evKey];
     if (existing == null || existing.$1 < ev.createdAt) {
-      _events?[evKey] = (
+      _events![evKey] = (
         ev.createdAt,
         widget.mapper != null ? widget.mapper!(ev) : ev as T,
       );
@@ -107,14 +105,14 @@ class RxFutureFilter<T> extends StatelessWidget {
   final Widget? loadingWidget;
   final T Function(Nip01Event)? mapper;
 
-  const RxFutureFilter({
-    super.key,
+  const RxFutureFilter(
+    Key key, {
     required this.filterBuilder,
     required this.builder,
     this.mapper,
     this.leaveOpen = true,
     this.loadingWidget,
-  });
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -123,6 +121,7 @@ class RxFutureFilter<T> extends StatelessWidget {
       builder: (ctx, data) {
         if (data.hasData) {
           return RxFilter<T>(
+            super.key!,
             filters: data.data!,
             mapper: mapper,
             builder: builder,

lib/utils.dart

@@ -1,5 +1,9 @@
+import 'package:bech32/bech32.dart';
 import 'package:collection/collection.dart';
+import 'package:convert/convert.dart';
+import 'package:intl/intl.dart';
 import 'package:ndk/ndk.dart';
+import 'package:ndk/shared/nips/nip19/nip19.dart';
 
 /// Container class over event and stream info
 class StreamEvent {
@@ -39,6 +43,7 @@ class StreamInfo {
   String? gameId;
   GameInfo? gameInfo;
   List<String> streams;
+  List<String>? relays;
 
   StreamInfo({
     this.id,
@@ -123,6 +128,12 @@ StreamInfo extractStreamInfo(Nip01Event ev) {
     matchTag(t, 'starts', (v) => ret.starts = int.tryParse(v));
     matchTag(t, 'ends', (v) => ret.ends = int.tryParse(v));
     matchTag(t, 'service', (v) => ret.service = v);
+    if (t[0] == "relays") {
+      ret.relays = t.slice(1);
+      if (ret.relays!.isEmpty) {
+        ret.relays = null;
+      }
+    }
   }
 
   var sortedTags = sortStreamTags(ev.tags);
@@ -223,12 +234,13 @@ class Category {
 List<Category> AllCategories = []; // Implement as needed
 
 String formatSats(int n) {
+  final fmt = NumberFormat();
   if (n >= 1000000) {
-    return "${(n / 1000000).toStringAsFixed(1)}M";
-  } else if (n >= 1000) {
-    return "${(n / 1000).toStringAsFixed(1)}k";
+    return "${fmt.format(n / 1000000)}M";
+  } else if (n >= 1500) {
+    return "${fmt.format(n / 1000)}K";
   } else {
-    return "$n";
+    return fmt.format(n);
   }
 }
 
@@ -238,3 +250,56 @@ String zapSum(List<Nip01Event> zaps) {
       .fold(0, (acc, v) => acc + (v.amountSats ?? 0));
   return formatSats(total);
 }
+
+String bech32ToHex(String bech32) {
+  final decoder = Bech32Decoder();
+  final data = decoder.convert(bech32, 10_000);
+  final data8bit = Nip19.convertBits(data.data, 5, 8, false);
+  if (data.hrp == "nevent" || data.hrp == "naddr" || data.hrp == "nprofile") {
+    final tlv = parseTLV(data8bit);
+    return hex.encode(tlv.firstWhere((v) => v.type == 0).value);
+  } else {
+    return hex.encode(data8bit);
+  }
+}
+
+class TLV {
+  final int type;
+  final int length;
+  final List<int> value;
+
+  TLV(this.type, this.length, this.value);
+}
+
+List<TLV> parseTLV(List<int> data) {
+  List<TLV> result = [];
+  int index = 0;
+
+  while (index < data.length) {
+    // Check if we have enough bytes for type and length
+    if (index + 2 > data.length) {
+      throw FormatException('Incomplete TLV data');
+    }
+
+    // Read type (1 byte)
+    int type = data[index];
+    index++;
+
+    // Read length (1 byte)
+    int length = data[index];
+    index++;
+
+    // Check if we have enough bytes for value
+    if (index + length > data.length) {
+      throw FormatException('TLV value length exceeds available data');
+    }
+
+    // Read value
+    List<int> value = data.sublist(index, index + length);
+    index += length;
+
+    result.add(TLV(type, length, value));
+  }
+
+  return result;
+}

lib/widgets/chat.dart

@@ -1,5 +1,3 @@
-import 'dart:developer' as developer;
-
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:ndk/ndk.dart';
@@ -8,15 +6,14 @@ import 'package:zap_stream_flutter/rx_filter.dart';
 import 'package:zap_stream_flutter/theme.dart';
 import 'package:zap_stream_flutter/utils.dart';
 import 'package:zap_stream_flutter/widgets/avatar.dart';
-import 'package:zap_stream_flutter/widgets/nostr_text.dart';
+import 'package:zap_stream_flutter/widgets/chat_message.dart';
+import 'package:zap_stream_flutter/widgets/chat_write.dart';
 import 'package:zap_stream_flutter/widgets/profile.dart';
-import 'package:zap_stream_flutter/widgets/profile_modal.dart';
 
 class ChatWidget extends StatelessWidget {
   final StreamEvent stream;
 
   const ChatWidget({super.key, required this.stream});
-
   @override
   Widget build(BuildContext context) {
     var muteLists = [stream.info.host];
@@ -24,18 +21,23 @@ class ChatWidget extends StatelessWidget {
       muteLists.add(ndk.accounts.getPublicKey()!);
     }
 
+    var filters = [
+      Filter(kinds: [1311, 9735], limit: 200, aTags: [stream.aTag]),
+      Filter(kinds: [Nip51List.kMute], authors: muteLists),
+    ];
     return RxFilter<Nip01Event>(
-      filters: [
-        Filter(kinds: [1311, 9735], limit: 200, aTags: [stream.aTag]),
-        Filter(kinds: [Nip51List.kMute], authors: muteLists),
-      ],
+      Key("stream:chat:${stream.aTag}"),
+      relays: stream.info.relays,
+      filters: filters,
       builder: (ctx, state) {
         final mutedPubkeys =
             (state ?? [])
                 .where((e) => e.kind == Nip51List.kMute)
                 .map((e) => e.tags)
                 .expand((e) => e)
-                .where((e) => e[0] == "p")
+                .where(
+                  (e) => e[0] == "p" && e[1] != stream.info.host,
+                ) // cant mute host
                 .map((e) => e[1])
                 .toSet();
 
@@ -52,45 +54,41 @@ class ChatWidget extends StatelessWidget {
                 .reversed
                 .toList();
 
+        final zaps =
+            filteredChat
+                .where((e) => e.kind == 9735)
+                .map((e) => ZapReceipt.fromEvent(e))
+                .toList();
         return Column(
           spacing: 8,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            _TopZappersWidget(events: filteredChat),
+            if (zaps.isNotEmpty) _TopZappersWidget(events: zaps),
+            if (stream.info.goal != null)
+              _StreamGoalWidget.id(stream.info.goal!),
             Expanded(
               child: ListView.builder(
                 reverse: true,
-                shrinkWrap: true,
                 primary: true,
                 itemCount: filteredChat.length,
                 itemBuilder:
                     (ctx, idx) => switch (filteredChat[idx].kind) {
-                      1311 => Padding(
-                        padding: EdgeInsets.symmetric(
-                          horizontal: 2,
-                          vertical: 2,
-                        ),
-                        child: _ChatMessageWidget(
-                          stream: stream,
-                          msg: filteredChat[idx],
-                        ),
+                      1311 => ChatMessageWidget(
+                        key: Key("chat:${filteredChat[idx].id}"),
+                        stream: stream,
+                        msg: filteredChat[idx],
                       ),
-                      9735 => Padding(
-                        padding: EdgeInsets.symmetric(
-                          horizontal: 2,
-                          vertical: 2,
-                        ),
-                        child: _ChatZapWidget(
-                          stream: stream,
-                          zap: filteredChat[idx],
-                        ),
+                      9735 => _ChatZapWidget(
+                        key: Key("chat:${filteredChat[idx].id}"),
+                        stream: stream,
+                        zap: filteredChat[idx],
                       ),
                       _ => SizedBox.shrink(),
                     },
               ),
             ),
             if (stream.info.status == StreamStatus.live)
-              _WriteMessageWidget(stream: stream),
+              WriteMessageWidget(stream: stream),
             if (stream.info.status == StreamStatus.ended)
               Container(
                 padding: EdgeInsets.all(8),
@@ -110,8 +108,108 @@ class ChatWidget extends StatelessWidget {
   }
 }
 
+class _StreamGoalWidget extends StatelessWidget {
+  final Nip01Event goal;
+
+  const _StreamGoalWidget({required this.goal});
+
+  static Widget id(String id) {
+    return RxFilter<Nip01Event>(
+      Key("stream:goal:$id"),
+      leaveOpen: false,
+      filters: [
+        Filter(kinds: [9041], ids: [id]),
+      ],
+      builder: (ctx, state) {
+        final goal = state?.firstOrNull;
+        return goal != null ? _StreamGoalWidget(goal: goal) : SizedBox.shrink();
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final max = int.parse(goal.getFirstTag("amount") ?? "1");
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 4, vertical: 4),
+      child: RxFilter<Nip01Event>(
+        Key("stream:goal:$id:zaps"),
+        filters: [
+          Filter(kinds: [9735], eTags: [goal.id]),
+        ],
+        builder: (ctx, state) {
+          final zaps = (state ?? []).map((e) => ZapReceipt.fromEvent(e));
+          final totalZaps =
+              zaps.fold(0, (acc, v) => acc + (v.amountSats ?? 0)) * 1000;
+          final progress = totalZaps / max;
+          final remaining = ((max - totalZaps).clamp(0, max) / 1000).toInt();
+
+          final q = MediaQuery.of(ctx);
+          return Column(
+            spacing: 4,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Expanded(child: Text(goal.content)),
+                  if (remaining > 0)
+                    Text(
+                      "Remaining: ${formatSats(remaining)}",
+                      style: TextStyle(fontSize: 10, color: LAYER_5),
+                    ),
+                ],
+              ),
+              Stack(
+                children: [
+                  Container(
+                    height: 10,
+                    decoration: BoxDecoration(
+                      color: LAYER_2,
+                      borderRadius: DEFAULT_BR,
+                    ),
+                  ),
+                  Container(
+                    height: 10,
+                    width: (q.size.width * progress).clamp(1, q.size.width),
+                    decoration: BoxDecoration(
+                      color: ZAP_1,
+                      borderRadius: DEFAULT_BR,
+                    ),
+                  ),
+                  if (remaining > 0)
+                    Positioned(
+                      right: 2,
+                      child: Text(
+                        "Goal: ${formatSats((max / 1000).toInt())}",
+                        style: TextStyle(
+                          fontSize: 8,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                    ),
+                  if (remaining == 0)
+                    Center(
+                      child: Text(
+                        "COMPLETE",
+                        style: TextStyle(
+                          color: LAYER_0,
+                          fontSize: 8,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                    ),
+                ],
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
+
 class _TopZappersWidget extends StatelessWidget {
-  final List<Nip01Event> events;
+  final List<ZapReceipt> events;
 
   const _TopZappersWidget({required this.events});
 
@@ -119,8 +217,6 @@ class _TopZappersWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     final topZaps =
         events
-            .where((e) => e.kind == 9735)
-            .map((e) => ZapReceipt.fromEvent(e))
             .fold(<String, int>{}, (acc, e) {
               if (e.sender != null) {
                 acc[e.sender!] = (acc[e.sender!] ?? 0) + e.amountSats!;
@@ -169,12 +265,13 @@ class _ChatZapWidget extends StatelessWidget {
   final StreamEvent stream;
   final Nip01Event zap;
 
-  const _ChatZapWidget({required this.stream, required this.zap});
+  const _ChatZapWidget({required this.stream, required this.zap, super.key});
 
   @override
   Widget build(BuildContext context) {
     final parsed = ZapReceipt.fromEvent(zap);
     return Container(
+      margin: EdgeInsets.symmetric(vertical: 4),
       padding: EdgeInsets.all(8),
       decoration: BoxDecoration(
         border: Border.all(color: ZAP_1),
@@ -234,195 +331,3 @@ class _ChatZapWidget extends StatelessWidget {
     );
   }
 }
-
-class _ChatMessageWidget extends StatelessWidget {
-  final StreamEvent stream;
-  final Nip01Event msg;
-
-  const _ChatMessageWidget({required this.stream, required this.msg});
-
-  @override
-  Widget build(BuildContext context) {
-    return ProfileLoaderWidget(msg.pubKey, (ctx, state) {
-      final profile = state.data ?? Metadata(pubKey: msg.pubKey);
-      return GestureDetector(
-        onLongPress: () {
-          if (ndk.accounts.canSign) {
-            showModalBottomSheet(
-              context: context,
-              constraints: BoxConstraints.expand(),
-              builder:
-                  (ctx) => ProfileModalWidget(profile: profile, event: msg),
-            );
-          }
-        },
-        child: Column(
-          spacing: 2,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            _chatText(profile),
-            RxFilter<Nip01Event>(
-              filters: [
-                Filter(kinds: [9735, 7], eTags: [msg.id]),
-              ],
-              builder: (ctx, data) => _chatReactions(data),
-            ),
-          ],
-        ),
-      );
-    });
-  }
-
-  Widget _chatText(Metadata profile) {
-    return RichText(
-      text: TextSpan(
-        children: [
-          WidgetSpan(
-            child: AvatarWidget(profile: profile, size: 24),
-            alignment: PlaceholderAlignment.middle,
-          ),
-          TextSpan(text: " "),
-          WidgetSpan(
-            alignment: PlaceholderAlignment.middle,
-            child: ProfileNameWidget(
-              profile: profile,
-              style: TextStyle(
-                color: msg.pubKey == stream.info.host ? PRIMARY_1 : SECONDARY_1,
-              ),
-            ),
-          ),
-          TextSpan(text: " "),
-          ...textToSpans(msg.content, msg.tags, msg.pubKey),
-        ],
-      ),
-    );
-  }
-
-  Widget _chatReactions(List<Nip01Event>? events) {
-    if ((events?.length ?? 0) == 0) return SizedBox.shrink();
-
-    final zaps = events!
-        .where((e) => e.kind == 9735)
-        .map((e) => ZapReceipt.fromEvent(e));
-    final reactions = events.where((e) => e.kind == 7);
-
-    return Row(
-      spacing: 8,
-      children: [
-        if (zaps.isNotEmpty)
-          Container(
-            padding: EdgeInsets.symmetric(horizontal: 4, vertical: 2),
-            decoration: BoxDecoration(color: LAYER_2, borderRadius: DEFAULT_BR),
-            child: Row(
-              children: [
-                Icon(Icons.bolt, color: ZAP_1, size: 16),
-                Text(
-                  formatSats(
-                    zaps.fold(0, (acc, v) => acc + (v.amountSats ?? 0)),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        if (reactions.isNotEmpty)
-          ...reactions
-              .fold(<String, Set<String>>{}, (acc, v) {
-                acc[v.content] ??= Set();
-                acc[v.content]!.add(v.pubKey);
-                return acc;
-              })
-              .entries
-              .map(
-                (v) => Container(
-                  padding: EdgeInsets.symmetric(horizontal: 4, vertical: 2),
-                  decoration: BoxDecoration(
-                    color: LAYER_2,
-                    borderRadius: DEFAULT_BR,
-                  ),
-                  child: Center(child: Text(v.key)),
-                ),
-              ),
-      ],
-    );
-  }
-}
-
-class _WriteMessageWidget extends StatefulWidget {
-  final StreamEvent stream;
-
-  const _WriteMessageWidget({required this.stream});
-
-  @override
-  State<StatefulWidget> createState() => __WriteMessageWidget();
-}
-
-class __WriteMessageWidget extends State<_WriteMessageWidget> {
-  final TextEditingController _controller = TextEditingController();
-
-  Future<void> _sendMessage() async {
-    final login = ndk.accounts.getLoggedAccount();
-    if (login == null) return;
-
-    final chatMsg = Nip01Event(
-      pubKey: login.pubkey,
-      kind: 1311,
-      content: _controller.text,
-      tags: [
-        ["a", widget.stream.aTag],
-      ],
-    );
-    developer.log(chatMsg.toString());
-    final res = ndk.broadcast.broadcast(nostrEvent: chatMsg);
-    await res.broadcastDoneFuture;
-    _controller.text = "";
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final canSign = ndk.accounts.canSign;
-    final isLogin = ndk.accounts.isLoggedIn;
-
-    return Container(
-      margin: EdgeInsets.fromLTRB(4, 8, 4, 0),
-      padding: EdgeInsets.symmetric(horizontal: 8),
-      decoration: BoxDecoration(color: LAYER_2, borderRadius: DEFAULT_BR),
-      child:
-          canSign
-              ? Row(
-                children: [
-                  Expanded(
-                    child: TextField(
-                      controller: _controller,
-                      onSubmitted: (_) => _sendMessage(),
-                      decoration: InputDecoration(
-                        labelText: "Write message",
-                        contentPadding: EdgeInsets.symmetric(vertical: 4),
-                        labelStyle: TextStyle(color: LAYER_4, fontSize: 14),
-                        border: InputBorder.none,
-                      ),
-                    ),
-                  ),
-                  //IconButton(onPressed: () {}, icon: Icon(Icons.mood)),
-                  IconButton(
-                    onPressed: () {
-                      _sendMessage();
-                    },
-                    icon: Icon(Icons.send),
-                  ),
-                ],
-              )
-              : Container(
-                padding: EdgeInsets.symmetric(vertical: 12),
-                child: Row(
-                  children: [
-                    Text(
-                      isLogin
-                          ? "Can't write messages with npub login"
-                          : "Please login to send messages",
-                    ),
-                  ],
-                ),
-              ),
-    );
-  }
-}

lib/widgets/chat_message.dart

@@ -0,0 +1,136 @@
+import 'package:flutter/material.dart';
+import 'package:ndk/ndk.dart';
+import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/rx_filter.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
+import 'package:zap_stream_flutter/widgets/avatar.dart';
+import 'package:zap_stream_flutter/widgets/chat_modal.dart';
+import 'package:zap_stream_flutter/widgets/nostr_text.dart';
+import 'package:zap_stream_flutter/widgets/profile.dart';
+
+class ChatMessageWidget extends StatelessWidget {
+  final StreamEvent stream;
+  final Nip01Event msg;
+
+  const ChatMessageWidget({super.key, required this.stream, required this.msg});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProfileLoaderWidget(msg.pubKey, (ctx, state) {
+      final profile = state.data ?? Metadata(pubKey: msg.pubKey);
+      return GestureDetector(
+        onLongPress: () {
+          if (ndk.accounts.canSign) {
+            showModalBottomSheet(
+              context: context,
+              constraints: BoxConstraints.expand(),
+              builder: (ctx) => ChatModalWidget(profile: profile, event: msg),
+            );
+          }
+        },
+        child: Padding(
+          padding: EdgeInsets.symmetric(horizontal: 2, vertical: 4),
+          child: Column(
+            spacing: 2,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [_chatText(profile), ChatReactions(msg: msg)],
+          ),
+        ),
+      );
+    }, key: Key("chat:${msg.id}:profile"));
+  }
+
+  Widget _chatText(Metadata profile) {
+    return RichText(
+      text: TextSpan(
+        children: [
+          WidgetSpan(
+            child: AvatarWidget(profile: profile, size: 24),
+            alignment: PlaceholderAlignment.middle,
+          ),
+          TextSpan(text: " "),
+          WidgetSpan(
+            alignment: PlaceholderAlignment.middle,
+            child: ProfileNameWidget(
+              profile: profile,
+              style: TextStyle(
+                color: msg.pubKey == stream.info.host ? PRIMARY_1 : SECONDARY_1,
+              ),
+            ),
+          ),
+          TextSpan(text: " "),
+          ...textToSpans(msg.content, msg.tags, msg.pubKey),
+        ],
+      ),
+    );
+  }
+}
+
+class ChatReactions extends StatelessWidget {
+  final Nip01Event msg;
+
+  const ChatReactions({super.key, required this.msg});
+
+  @override
+  Widget build(BuildContext context) {
+    return RxFilter<Nip01Event>(
+      Key("chat:${msg.id}:reactions"),
+      filters: [
+        Filter(kinds: [9735, 7], eTags: [msg.id]),
+      ],
+      builder: (ctx, data) => _chatReactions(data),
+    );
+  }
+
+  Widget _chatReactions(List<Nip01Event>? events) {
+    if ((events?.length ?? 0) == 0) return SizedBox.shrink();
+
+    // reactions must have e tag pointing to msg
+    final filteredEvents = events!.where((e) => e.getEId() == msg.id);
+    final zaps = filteredEvents
+        .where((e) => e.kind == 9735)
+        .map((e) => ZapReceipt.fromEvent(e));
+    final reactions = filteredEvents.where((e) => e.kind == 7);
+
+    return Row(
+      spacing: 8,
+      children: [
+        if (zaps.isNotEmpty)
+          Container(
+            padding: EdgeInsets.symmetric(horizontal: 4, vertical: 2),
+            decoration: BoxDecoration(color: LAYER_2, borderRadius: DEFAULT_BR),
+            child: Row(
+              children: [
+                Icon(Icons.bolt, color: ZAP_1, size: 16),
+                Text(
+                  formatSats(
+                    zaps.fold(0, (acc, v) => acc + (v.amountSats ?? 0)),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        if (reactions.isNotEmpty)
+          ...reactions
+              .fold(<String, Set<String>>{}, (acc, v) {
+                // ignore: prefer_collection_literals
+                acc[v.content] ??= Set();
+                acc[v.content]!.add(v.pubKey);
+                return acc;
+              })
+              .entries
+              .map(
+                (v) => Container(
+                  padding: EdgeInsets.symmetric(horizontal: 4, vertical: 2),
+                  decoration: BoxDecoration(
+                    color: LAYER_2,
+                    borderRadius: DEFAULT_BR,
+                  ),
+                  child: Center(child: Text(v.key)),
+                ),
+              ),
+      ],
+    );
+  }
+}

lib/widgets/chat_modal.dart

@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:ndk/ndk.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/widgets/mute_button.dart';
+import 'package:zap_stream_flutter/widgets/nostr_text.dart';
+import 'package:zap_stream_flutter/widgets/profile.dart';
+import 'package:zap_stream_flutter/widgets/reaction.dart';
+import 'package:zap_stream_flutter/widgets/zap.dart';
+
+class ChatModalWidget extends StatefulWidget {
+  final Metadata profile;
+  final Nip01Event event;
+
+  const ChatModalWidget({
+    super.key,
+    required this.profile,
+    required this.event,
+  });
+
+  @override
+  State<StatefulWidget> createState() => _ChatModalWidget();
+}
+
+class _ChatModalWidget extends State<ChatModalWidget> {
+  bool _showEmojiPicker = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.fromLTRB(5, 10, 5, 0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        spacing: 10,
+        children: [
+          ProfileWidget(profile: widget.profile),
+          Container(
+            width: double.maxFinite,
+            decoration: BoxDecoration(color: LAYER_2, borderRadius: DEFAULT_BR),
+            padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+            child: NoteText(event: widget.event),
+          ),
+          Row(
+            spacing: 8,
+            children: [
+              IconButton.filled(
+                color: LAYER_5,
+                style: ButtonStyle(
+                  backgroundColor: WidgetStateColor.resolveWith((_) => LAYER_3),
+                ),
+                onPressed:
+                    () => setState(() {
+                      _showEmojiPicker = !_showEmojiPicker;
+                    }),
+                icon: Icon(Icons.mood),
+              ),
+              IconButton.filled(
+                color: ZAP_1,
+                style: ButtonStyle(
+                  backgroundColor: WidgetStateColor.resolveWith((_) => LAYER_3),
+                ),
+                onPressed: () {
+                  Navigator.pop(context);
+                  showModalBottomSheet(
+                    context: context,
+                    builder: (ctx) {
+                      return ZapWidget(
+                        pubkey: widget.event.pubKey,
+                        target: widget.event,
+                      );
+                    },
+                  );
+                },
+                icon: Icon(Icons.bolt),
+              ),
+            ],
+          ),
+          if (_showEmojiPicker) ReactionWidget(event: widget.event),
+          MuteButton(
+            pubkey: widget.event.pubKey,
+            onTap: () {
+              Navigator.pop(context);
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/chat_write.dart

@@ -0,0 +1,90 @@
+import 'package:flutter/material.dart';
+import 'package:ndk/ndk.dart';
+import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
+
+class WriteMessageWidget extends StatefulWidget {
+  final StreamEvent stream;
+
+  const WriteMessageWidget({super.key, required this.stream});
+
+  @override
+  State<StatefulWidget> createState() => __WriteMessageWidget();
+}
+
+class __WriteMessageWidget extends State<WriteMessageWidget> {
+  late final TextEditingController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = TextEditingController();
+  }
+
+  Future<void> _sendMessage() async {
+    final login = ndk.accounts.getLoggedAccount();
+    if (login == null) return;
+
+    final chatMsg = Nip01Event(
+      pubKey: login.pubkey,
+      kind: 1311,
+      content: _controller.text,
+      tags: [
+        ["a", widget.stream.aTag],
+      ],
+    );
+    _controller.text = "";
+    final res = ndk.broadcast.broadcast(nostrEvent: chatMsg);
+    await res.broadcastDoneFuture;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final canSign = ndk.accounts.canSign;
+    final isLogin = ndk.accounts.isLoggedIn;
+
+    return Container(
+      margin: EdgeInsets.fromLTRB(4, 8, 4, 0),
+      padding: EdgeInsets.symmetric(horizontal: 8),
+      decoration: BoxDecoration(color: LAYER_2, borderRadius: DEFAULT_BR),
+      child:
+          canSign
+              ? Row(
+                children: [
+                  Expanded(
+                    child: TextField(
+                      controller: _controller,
+                      onSubmitted: (_) => _sendMessage(),
+                      decoration: InputDecoration(
+                        labelText: "Write message",
+                        contentPadding: EdgeInsets.symmetric(vertical: 4),
+                        labelStyle: TextStyle(color: LAYER_4, fontSize: 14),
+                        border: InputBorder.none,
+                      ),
+                    ),
+                  ),
+                  //IconButton(onPressed: () {}, icon: Icon(Icons.mood)),
+                  IconButton(
+                    onPressed: () {
+                      _sendMessage();
+                    },
+                    icon: Icon(Icons.send),
+                  ),
+                ],
+              )
+              : Container(
+                padding: EdgeInsets.symmetric(vertical: 12),
+                child: Row(
+                  children: [
+                    Text(
+                      isLogin
+                          ? "Can't write messages with npub login"
+                          : "Please login to send messages",
+                    ),
+                  ],
+                ),
+              ),
+    );
+  }
+}

lib/widgets/mute_button.dart

@@ -6,8 +6,17 @@ import 'package:zap_stream_flutter/widgets/button.dart';
 
 class MuteButton extends StatelessWidget {
   final String pubkey;
+  final void Function()? onTap;
+  final void Function()? onMute;
+  final void Function()? onUnmute;
 
-  const MuteButton({super.key, required this.pubkey});
+  const MuteButton({
+    super.key,
+    required this.pubkey,
+    this.onTap,
+    this.onMute,
+    this.onUnmute,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -32,6 +41,9 @@ class MuteButton extends StatelessWidget {
           padding: EdgeInsets.symmetric(vertical: 4, horizontal: 12),
           decoration: BoxDecoration(color: WARNING, borderRadius: DEFAULT_BR),
           onTap: () async {
+            if (onTap != null) {
+              onTap!();
+            }
             if (isMuted) {
               await ndk.lists.broadcastRemoveNip51ListElement(
                 Nip51List.kMute,
@@ -39,6 +51,9 @@ class MuteButton extends StatelessWidget {
                 pubkey,
                 null,
               );
+              if (onUnmute != null) {
+                onUnmute!();
+              }
             } else {
               await ndk.lists.broadcastAddNip51ListElement(
                 Nip51List.kMute,
@@ -46,9 +61,10 @@ class MuteButton extends StatelessWidget {
                 pubkey,
                 null,
               );
-            }
-            if (ctx.mounted) {
-              Navigator.pop(ctx);
+
+              if (onMute != null) {
+                onMute!();
+              }
             }
           },
         );

lib/widgets/nostr_text.dart

@@ -5,8 +5,24 @@ import 'package:ndk/ndk.dart';
 import 'package:ndk/shared/nips/nip19/nip19.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
 import 'package:zap_stream_flutter/widgets/profile.dart';
 
+class NoteText extends StatelessWidget {
+  final Nip01Event event;
+
+  const NoteText({super.key, required this.event});
+
+  @override
+  Widget build(BuildContext context) {
+    return RichText(
+      text: TextSpan(
+        children: textToSpans(event.content, event.tags, event.pubKey),
+      ),
+    );
+  }
+}
+
 /// Converts a nostr note text containing links
 /// and mentions into multiple spans for rendering
 List<InlineSpan> textToSpans(
@@ -62,10 +78,15 @@ InlineSpan _buildProfileOrNoteSpan(String word) {
       cleanedWord.startsWith('note') || cleanedWord.startsWith('nevent');
 
   if (isProfile) {
-    return _inlineMention(Nip19.decode(cleanedWord));
+    final hexKey = bech32ToHex(cleanedWord);
+    if (hexKey.isNotEmpty) {
+      return _inlineMention(hexKey);
+    } else {
+      return TextSpan(text: "@$cleanedWord");
+    }
   }
   if (isNote) {
-    final eventId = Nip19.decode(cleanedWord);
+    final eventId = bech32ToHex(cleanedWord);
     return TextSpan(text: eventId, style: TextStyle(color: PRIMARY_1));
   } else {
     return TextSpan(text: word);

lib/widgets/profile.dart

@@ -14,6 +14,7 @@ class ProfileLoaderWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return FutureBuilder(
+      key: super.key ?? Key("profile-loader:$pubkey"),
       future: ndk.metadata.loadMetadata(pubkey),
       builder: builder,
     );
@@ -26,14 +27,14 @@ class ProfileNameWidget extends StatelessWidget {
 
   const ProfileNameWidget({super.key, required this.profile, this.style});
 
-  static Widget pubkey(String pubkey, {TextStyle? style}) {
-    return FutureBuilder(
-      future: ndk.metadata.loadMetadata(pubkey),
-      builder:
-          (ctx, data) => ProfileNameWidget(
-            profile: data.data ?? Metadata(pubKey: pubkey),
-            style: style,
-          ),
+  static Widget pubkey(String pubkey, {Key? key, TextStyle? style}) {
+    return ProfileLoaderWidget(
+      pubkey,
+      (ctx, data) => ProfileNameWidget(
+        profile: data.data ?? Metadata(pubKey: pubkey),
+        style: style,
+      ),
+      key: key,
     );
   }
 
@@ -84,6 +85,7 @@ class ProfileWidget extends StatelessWidget {
     List<Widget>? children,
     bool? showName,
     double? spacing,
+    Key? key,
   }) {
     return ProfileLoaderWidget(pubkey, (ctx, state) {
       return ProfileWidget(
@@ -91,6 +93,7 @@ class ProfileWidget extends StatelessWidget {
         size: size,
         showName: showName,
         spacing: spacing,
+        key: key,
         children: children,
       );
     });
@@ -102,7 +105,7 @@ class ProfileWidget extends StatelessWidget {
       spacing: spacing ?? 8,
       children: [
         AvatarWidget(profile: profile, size: size),
-        if (showName ?? true) ProfileNameWidget(profile: profile),
+        if (showName ?? true) ProfileNameWidget(profile: profile, key: key),
         ...(children ?? []),
       ],
     );

lib/widgets/profile_modal.dart

@@ -1,85 +0,0 @@
-import 'dart:developer' as developer;
-
-import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
-import 'package:flutter/foundation.dart' as foundation;
-import 'package:flutter/material.dart';
-import 'package:ndk/ndk.dart';
-import 'package:zap_stream_flutter/main.dart';
-import 'package:zap_stream_flutter/theme.dart';
-import 'package:zap_stream_flutter/widgets/button.dart';
-import 'package:zap_stream_flutter/widgets/mute_button.dart';
-import 'package:zap_stream_flutter/widgets/profile.dart';
-import 'package:zap_stream_flutter/widgets/zap.dart';
-
-class ProfileModalWidget extends StatelessWidget {
-  final Metadata profile;
-  final Nip01Event event;
-
-  const ProfileModalWidget({
-    super.key,
-    required this.profile,
-    required this.event,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: EdgeInsets.fromLTRB(5, 10, 5, 0),
-      child: Column(
-        spacing: 10,
-        children: [
-          ProfileWidget(profile: profile),
-          EmojiPicker(
-            onEmojiSelected: (category, emoji) {
-              developer.log(emoji.emoji);
-              ndk.broadcast.broadcastReaction(
-                eventId: event.id,
-                reaction: emoji.emoji,
-              );
-              Navigator.pop(context);
-            },
-            config: Config(
-              height: 256,
-              checkPlatformCompatibility: true,
-              emojiViewConfig: EmojiViewConfig(
-                emojiSizeMax:
-                    28 *
-                    (foundation.defaultTargetPlatform == TargetPlatform.iOS
-                        ? 1.20
-                        : 1.0),
-                backgroundColor: LAYER_1,
-              ),
-              viewOrderConfig: const ViewOrderConfig(
-                top: EmojiPickerItem.categoryBar,
-                middle: EmojiPickerItem.emojiView,
-                bottom: EmojiPickerItem.searchBar,
-              ),
-              bottomActionBarConfig: BottomActionBarConfig(
-                backgroundColor: LAYER_2,
-                buttonColor: PRIMARY_1,
-              ),
-              categoryViewConfig: CategoryViewConfig(backgroundColor: LAYER_2),
-              searchViewConfig: SearchViewConfig(
-                backgroundColor: LAYER_2,
-                buttonIconColor: PRIMARY_1,
-              ),
-            ),
-          ),
-          BasicButton.text(
-            "Zap",
-            onTap: () {
-              showModalBottomSheet(
-                context: context,
-                constraints: BoxConstraints.expand(),
-                builder: (ctx) {
-                  return ZapWidget(pubkey: event.pubKey, target: event);
-                },
-              );
-            },
-          ),
-          MuteButton(pubkey: event.pubKey),
-        ],
-      ),
-    );
-  }
-}

lib/widgets/reaction.dart

@@ -0,0 +1,51 @@
+import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
+import 'package:flutter/foundation.dart' as foundation;
+import 'package:flutter/widgets.dart';
+import 'package:ndk/entities.dart';
+import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/theme.dart';
+
+class ReactionWidget extends StatelessWidget {
+  final Nip01Event event;
+
+  const ReactionWidget({super.key, required this.event});
+
+  @override
+  Widget build(BuildContext context) {
+    return EmojiPicker(
+      onEmojiSelected: (category, emoji) {
+        ndk.broadcast.broadcastReaction(
+          eventId: event.id,
+          reaction: emoji.emoji,
+        );
+        Navigator.pop(context);
+      },
+      config: Config(
+        height: 256,
+        checkPlatformCompatibility: true,
+        emojiViewConfig: EmojiViewConfig(
+          emojiSizeMax:
+              28 *
+              (foundation.defaultTargetPlatform == TargetPlatform.iOS
+                  ? 1.20
+                  : 1.0),
+          backgroundColor: LAYER_1,
+        ),
+        viewOrderConfig: const ViewOrderConfig(
+          top: EmojiPickerItem.categoryBar,
+          middle: EmojiPickerItem.emojiView,
+          bottom: EmojiPickerItem.searchBar,
+        ),
+        bottomActionBarConfig: BottomActionBarConfig(
+          backgroundColor: LAYER_2,
+          buttonColor: PRIMARY_1,
+        ),
+        categoryViewConfig: CategoryViewConfig(backgroundColor: LAYER_2),
+        searchViewConfig: SearchViewConfig(
+          backgroundColor: LAYER_2,
+          buttonIconColor: PRIMARY_1,
+        ),
+      ),
+    );
+  }
+}

lib/widgets/stream_grid.dart

@@ -21,45 +21,71 @@ class StreamGrid extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final streams = events
-        .map((e) => StreamEvent(e))
-        .sortedBy((a) => a.info.starts ?? a.event.createdAt)
-        .reversed;
+    final streams =
+        events
+            .map((e) => StreamEvent(e))
+            .sortedBy((a) => a.info.starts ?? a.event.createdAt)
+            .reversed;
     final live = streams.where((s) => s.info.status == StreamStatus.live);
     final ended = streams.where((s) => s.info.status == StreamStatus.ended);
     final planned = streams.where((s) => s.info.status == StreamStatus.planned);
     return Column(
       spacing: 16,
       children: [
-        if (showLive && live.isNotEmpty) _streamGroup("Live", live),
-        if (showPlanned && planned.isNotEmpty) _streamGroup("Planned", planned),
-        if (showEnded && ended.isNotEmpty) _streamGroup("Ended", ended),
+        if (showLive && live.isNotEmpty) _streamGroup(context, "Live", live),
+        if (showPlanned && planned.isNotEmpty)
+          _streamGroup(context, "Planned", planned),
+        if (showEnded && ended.isNotEmpty)
+          _streamGroup(context, "Ended", ended),
       ],
     );
   }
 
-  Widget _streamGroup(String title, Iterable<StreamEvent> events) {
+  Widget _streamTitle(String title) {
+    return Row(
+      spacing: 16,
+      children: [
+        Text(
+          title,
+          style: TextStyle(fontSize: 21, fontWeight: FontWeight.w500),
+        ),
+        Expanded(
+          child: Container(
+            height: 1,
+            decoration: BoxDecoration(
+              border: Border(bottom: BorderSide(color: LAYER_2)),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _streamGroup(
+    BuildContext context,
+    String title,
+    Iterable<StreamEvent> events,
+  ) {
+    final eventList = events.toList();
+
+    // profide fixed item size for performance
+    final q = MediaQuery.of(context);
     return Column(
       spacing: 16,
       children: [
-        Row(
-          spacing: 16,
-          children: [
-            Text(
-              title,
-              style: TextStyle(fontSize: 21, fontWeight: FontWeight.w500),
-            ),
-            Expanded(
-              child: Container(
-                height: 1,
-                decoration: BoxDecoration(
-                  border: Border(bottom: BorderSide(color: LAYER_2)),
-                ),
-              ),
-            ),
-          ],
+        _streamTitle(title),
+        ListView.builder(
+          itemCount: eventList.length,
+          primary: false,
+          shrinkWrap: true,
+          itemBuilder: (ctx, idx) {
+            final stream = eventList[idx];
+            return Padding(
+              padding: EdgeInsets.symmetric(vertical: 8),
+              child: StreamTileWidget(stream),
+            );
+          },
         ),
-        ...events.map((e) => StreamTileWidget(e)),
       ],
     );
   }

lib/widgets/zap.dart

@@ -1,4 +1,5 @@
 import 'package:clipboard/clipboard.dart';
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:ndk/domain_layer/usecases/lnurl/lnurl.dart';
 import 'package:ndk/ndk.dart';
@@ -13,8 +14,16 @@ import 'package:zap_stream_flutter/widgets/profile.dart';
 class ZapWidget extends StatefulWidget {
   final String pubkey;
   final Nip01Event? target;
+  final List<Nip01Event>? otherTargets;
+  final List<List<String>>? zapTags;
 
-  const ZapWidget({super.key, required this.pubkey, this.target});
+  const ZapWidget({
+    super.key,
+    required this.pubkey,
+    this.target,
+    this.zapTags,
+    this.otherTargets,
+  });
 
   @override
   State<StatefulWidget> createState() => _ZapWidget();
@@ -84,6 +93,7 @@ class _ZapWidget extends State<ZapWidget> {
       ),
       BasicButton.text(
         "Zap",
+        decoration: BoxDecoration(color: LAYER_3, borderRadius: DEFAULT_BR),
         onTap: () {
           try {
             _loadZap();
@@ -132,29 +142,53 @@ class _ZapWidget extends State<ZapWidget> {
     ];
   }
 
+  Future<ZapRequest?> _makeZap() async {
+    final signer = ndk.accounts.getLoggedAccount()?.signer;
+    if (signer == null) return null;
+
+    var relays = defaultRelays;
+    // if target event has relays tag, use that for zap
+    if (widget.target?.tags.any((t) => t[0] == "relays") ?? false) {
+      relays = widget.target!.tags.firstWhere((t) => t[0] == "relays").slice(1);
+    }
+    final amount = _amount! * 1000;
+
+    var tags = [
+      ["relays", ...relays],
+      ["amount", amount.toString()],
+      ["p", widget.pubkey],
+    ];
+
+    // tag targets for zap request
+    for (final t in [
+      ...(widget.target != null ? [widget.target!] : []),
+      ...(widget.otherTargets != null ? widget.otherTargets! : []),
+    ]) {
+      if (t.kind >= 30_000 && t.kind < 40_000) {
+        tags.add(["a", "${t.kind}:${t.pubKey}:${t.getDtag()!}"]);
+      } else {
+        tags.add(["e", t.id]);
+      }
+    }
+    if (widget.zapTags != null) {
+      tags.addAll(widget.zapTags!);
+    }
+    var event = ZapRequest(
+      pubKey: signer.getPublicKey(),
+      tags: tags,
+      content: _comment.text,
+    );
+    await signer.sign(event);
+    return event;
+  }
+
   Future<void> _loadZap() async {
     final profile = await ndk.metadata.loadMetadata(widget.pubkey);
     if (profile?.lud16 == null) {
       throw "No lightning address found";
     }
-    final signer = ndk.accounts.getLoggedAccount()?.signer;
-
-    final zapRequest =
-        signer != null
-            ? await ndk.zaps.createZapRequest(
-              amountSats: _amount!,
-              signer: signer,
-              pubKey: widget.pubkey,
-              eventId: widget.target?.id,
-              addressableId:
-                  widget.target != null && widget.target!.kind >= 30_000 && widget.target!.kind < 40_000
-                      ? "${widget.target!.kind}:${widget.target!.pubKey}:${widget.target!.getDtag()!}"
-                      : null,
-              relays: defaultRelays,
-              comment: _comment.text.isNotEmpty ? _comment.text : null,
-            )
-            : null;
 
+    final zapRequest = await _makeZap();
     final invoice = await ndk.zaps.fetchInvoice(
       lud16Link: Lnurl.getLud16LinkFromLud16(profile!.lud16!)!,
       amountSats: _amount!,
@@ -174,7 +208,7 @@ class _ZapWidget extends State<ZapWidget> {
           }),
       child: Container(
         decoration: BoxDecoration(
-          color: n == _amount ? LAYER_2 : LAYER_1,
+          color: n == _amount ? LAYER_4 : LAYER_3,
           borderRadius: DEFAULT_BR,
         ),
         alignment: AlignmentDirectional.center,

pubspec.lock

@@ -26,7 +26,7 @@ packages:
     source: hosted
     version: "2.12.0"
   bech32:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: bech32
       sha256: "156cbace936f7720c79a79d16a03efad343b1ef17106716e04b8b8e39f99f7f7"
@@ -480,6 +480,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.1+1"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.20.2"
   js:
     dependency: transitive
     description:
@@ -572,26 +580,28 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/ndk"
-      ref: bbf2aa9c2468b2301de65734199649d56bb0fd74
-      resolved-ref: bbf2aa9c2468b2301de65734199649d56bb0fd74
+      ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
+      resolved-ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
       url: "https://github.com/relaystr/ndk"
     source: git
     version: "0.3.2"
   ndk_amber:
     dependency: "direct main"
     description:
-      name: ndk_amber
-      sha256: "6f525e2bcdea08ecdd1815e2fdfc6e53c4bb86335927d8c333c1f4513dc1c099"
-      url: "https://pub.dev"
-    source: hosted
+      path: "packages/amber"
+      ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
+      resolved-ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
+      url: "https://github.com/relaystr/ndk"
+    source: git
     version: "0.3.0"
   ndk_objectbox:
     dependency: "direct main"
     description:
-      name: ndk_objectbox
-      sha256: f2bd04299ed34b99a01957c46eb6ff495c0bdcde068d382cbb8b8a222f67e132
-      url: "https://pub.dev"
-    source: hosted
+      path: "packages/objectbox"
+      ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
+      resolved-ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
+      url: "https://github.com/relaystr/ndk"
+    source: git
     version: "0.2.3"
   ndk_rust_verifier:
     dependency: "direct main"
@@ -1190,6 +1200,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.5.0"
+  xxh3:
+    dependency: transitive
+    description:
+      name: xxh3
+      sha256: "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
 sdks:
   dart: ">=3.7.2 <4.0.0"
   flutter: ">=3.27.0"

pubspec.yaml

@@ -1,7 +1,7 @@
 name: zap_stream_flutter
 description: "zap.stream"
 publish_to: 'none'
-version: 0.2.1+3
+version: 0.3.0+5
 
 environment:
   sdk: ^3.7.2
@@ -30,13 +30,25 @@ dependencies:
   chewie: ^1.11.3
   image_picker: ^1.1.2
   emoji_picker_flutter: ^4.3.0
+  bech32: ^0.2.2
+  intl: ^0.20.2
 
 dependency_overrides:
   ndk:
     git:
       url: https://github.com/relaystr/ndk
       path: packages/ndk
-      ref: bbf2aa9c2468b2301de65734199649d56bb0fd74
+      ref: 919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a
+  ndk_objectbox:
+    git:
+      url: https://github.com/relaystr/ndk
+      path: packages/objectbox
+      ref: 919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a
+  ndk_amber:
+    git:
+      url: https://github.com/relaystr/ndk
+      path: packages/amber
+      ref: 919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a
 
 dev_dependencies:
   flutter_test: