repin joinstr_flutter to merged master, surface pool expiry as absolute timestamp

Author: kwsantiago

lib/features/joinstr/data/joinstr_datasource.dart

@@ -29,7 +29,7 @@ class JoinstrDatasource {
             rawJson: p.rawJson,
             denominationSat: p.denominationSat.toInt(),
             peers: p.peers,
-            timeoutSec: p.timeout.toInt(),
+            expiresAtUnixSec: p.expiresAtUnixSec.toInt(),
             relay: p.relay,
             feeRateSatPerVb: p.feeRate,
             publicKey: p.publicKey,

lib/features/joinstr/domain/joinstr.dart

@@ -30,7 +30,10 @@ class JoinstrPool {
   final String rawJson;
   final int denominationSat;
   final int peers;
-  final int timeoutSec;
+
+  /// When the pool expires, as a unix timestamp in seconds (absolute, not a
+  /// duration).
+  final int expiresAtUnixSec;
   final String relay;
   final int feeRateSatPerVb;
   final String publicKey;
@@ -40,11 +43,17 @@ class JoinstrPool {
     required this.rawJson,
     required this.denominationSat,
     required this.peers,
-    required this.timeoutSec,
+    required this.expiresAtUnixSec,
     required this.relay,
     required this.feeRateSatPerVb,
     required this.publicKey,
   });
+
+  /// Seconds until the pool expires relative to [now], clamped at zero.
+  int secondsUntilExpiry(DateTime now) {
+    final remaining = expiresAtUnixSec - now.millisecondsSinceEpoch ~/ 1000;
+    return remaining > 0 ? remaining : 0;
+  }
 }
 
 abstract final class Joinstr {

lib/features/joinstr/ui/screens/joinstr_screen.dart

@@ -155,7 +155,10 @@ class _PoolTile extends StatelessWidget {
           context.loc.joinstrPoolSummary(pool.denominationSat, pool.peers),
         ),
         subtitle: Text(
-          context.loc.joinstrPoolDetail(pool.feeRateSatPerVb, pool.timeoutSec),
+          context.loc.joinstrPoolDetail(
+            pool.feeRateSatPerVb,
+            pool.secondsUntilExpiry(DateTime.now()),
+          ),
         ),
         trailing: FilledButton(
           onPressed: enabled

localization/app_en.arb

@@ -479,14 +479,14 @@
       }
     }
   },
-  "joinstrPoolDetail": "{feeRate} sat/vB · expires in {timeoutSec}s",
+  "joinstrPoolDetail": "{feeRate} sat/vB · expires in {secondsLeft}s",
   "@joinstrPoolDetail": {
-    "description": "Secondary line of a joinstr pool tile: fee rate and timeout",
+    "description": "Secondary line of a joinstr pool tile: fee rate and seconds until the pool expires",
     "placeholders": {
       "feeRate": {
         "type": "int"
       },
-      "timeoutSec": {
+      "secondsLeft": {
         "type": "int"
       }
     }

pubspec.lock

@@ -1232,8 +1232,8 @@ packages:
     dependency: "direct main"
     description:
       path: dart
-      ref: e4229f278e329a49f053bfb44465fc3f1c7085be
-      resolved-ref: e4229f278e329a49f053bfb44465fc3f1c7085be
+      ref: e4b77ec4341eebbb22cef74b57e608841779fcd7
+      resolved-ref: e4b77ec4341eebbb22cef74b57e608841779fcd7
       url: "https://github.com/rust-joinstr/joinstr"
     source: git
     version: "0.1.0"

pubspec.yaml

@@ -47,7 +47,7 @@ dependencies:
   joinstr_flutter:
     git:
       url: https://github.com/rust-joinstr/joinstr
-      ref: e4229f278e329a49f053bfb44465fc3f1c7085be
+      ref: e4b77ec4341eebbb22cef74b57e608841779fcd7
       path: dart
   qr_flutter: ^4.1.0
   dio: ^5.9.0

test/features/joinstr/domain/joinstr_test.dart

@@ -155,6 +155,31 @@ void main() {
     );
   });
 
+  group('pool expiry', () {
+    JoinstrPool poolExpiringAt(int unixSec) => JoinstrPool(
+      id: 'p',
+      rawJson: '{}',
+      denominationSat: 100000,
+      peers: 2,
+      expiresAtUnixSec: unixSec,
+      relay: 'wss://nos.lol',
+      feeRateSatPerVb: 1,
+      publicKey: 'pk',
+    );
+
+    test('reports the seconds remaining until an absolute expiry', () {
+      final now = DateTime.utc(2026, 1, 1);
+      final nowSec = now.millisecondsSinceEpoch ~/ 1000;
+      expect(poolExpiringAt(nowSec + 300).secondsUntilExpiry(now), 300);
+    });
+
+    test('clamps a past expiry to zero rather than going negative', () {
+      final now = DateTime.utc(2026, 1, 1);
+      final nowSec = now.millisecondsSinceEpoch ~/ 1000;
+      expect(poolExpiringAt(nowSec - 60).secondsUntilExpiry(now), 0);
+    });
+  });
+
   group('denomination conversion', () {
     test('converts satoshis to BTC for the pool config', () {
       expect(Joinstr.denominationBtc(100000), 0.001);