chore: update journeys with rich format

Author: jvsena42

journeys/cjit-notifications/README.md

@@ -22,12 +22,18 @@ producers:
 
 ## The fix (what the journeys assert)
 
-- `WakeNodeWorker` formats amounts with `formatToModernDisplay()` (space-grouped). [#1]
-- `WakeNodeWorker` only emits the "Via new channel" CJIT notification when the channel actually has
-  a Blocktank CJIT entry; a regular channel opening shows no payment notification. [#3]
+- All received-payment notifications (foreground service, in-app, and the `WakeNodeWorker` push
+  path, for both regular payments and CJIT receives) are built by one shared
+  `ReceivedNotificationContent`, so they are identical: title "Payment Received", body
+  "Received ₿ <amount> (<fiat>)" — space-grouped BTC plus fiat, ordered by the primary
+  display setting (or hidden when notification details are off). The legacy bare "₿ <sats>" /
+  "Via new channel" push format is gone. [#1]
+- `WakeNodeWorker` only emits a CJIT notification when the channel actually has a Blocktank CJIT
+  entry and the receive was not already recorded; a regular channel opening shows no payment
+  notification. [#3]
 - `WakeNodeWorker` skips its own user-facing notification when an in-process handler covers the
   event — i.e. when the app is in the foreground OR `LightningNodeService.isRunning` — leaving a
-  single, richer notification. It still wakes the node and records the activity. [#2]
+  single notification. It still wakes the node and records the activity. [#2]
 
 ## Mandatory setup
 
@@ -54,6 +60,9 @@ notifications Bitkit posted for a single channel opening.
 ## Test tags / references
 
 - Foreground "Spending balance ready" toast: testTag `SpendingBalanceReadyToast`.
-- Notification strings: `notification__received__title`, `notification__received__body_channel`
-  ("Via new channel"), `notification__received__body_amount` ("Received %s").
-- Amount grouping separator: `SATS_GROUPING_SEPARATOR` (a space) via `formatToModernDisplay`.
+- Notification strings: `notification__received__title` ("Payment Received"),
+  `notification__received__body_amount` ("Received %s"), `notification__received__body_hidden`
+  (when notification details are off). Note: `notification__received__body_channel`
+  ("Via new channel") is no longer used for the push notification.
+- Amount grouping separator: `SATS_GROUPING_SEPARATOR` (a space) via `formatToModernDisplay`,
+  applied inside `ReceivedNotificationContent`.

journeys/cjit-notifications/cjit-foreground-service-notification.xml

@@ -18,8 +18,8 @@
     <action>Wait ~5s for the ChannelReady event and notification delivery</action>
     <action>Dump notifications: adb shell dumpsys notification --noredact | grep -A3 -i "to.bitkit"</action>
     <action>Verify EXACTLY ONE Bitkit payment notification is posted for this channel opening (not two)</action>
-    <action>Verify its amount uses a thousands separator space, e.g. "₿ 48 064" — NOT "₿ 48064"</action>
-    <action>Verify there is NO separate notification whose body is "Via new channel" alongside the payment notification</action>
+    <action>Verify its title is "Payment Received" and body is "Received ₿ &lt;amount&gt; (&lt;fiat&gt;)" with the amount space-grouped (e.g. "Received ₿ 48 064 ($30.79)") — NOT a bare "₿ 48064"</action>
+    <action>Verify there is NO separate "Via new channel" notification from WakeNodeWorker alongside it (the push path is deduped while the foreground service is running)</action>
     <action>Tap the notification, bring the app to the foreground, and verify the received-transaction sheet shows the correct amount</action>
   </actions>
 </journey>

journeys/cjit-notifications/cjit-push-single-notification.xml

@@ -3,7 +3,9 @@
     Reproduces PR #787 issue #2 on the pure push path. With the app fully killed (no foreground
     activity and no foreground service), a CJIT payment must still surface a single payment
     notification delivered by WakeNodeWorker — this is the wake-the-node-and-open-the-channel path,
-    so it must keep working. The amount must be space-grouped.
+    so it must keep working. The notification must use the same rich content as the in-app one:
+    title "Payment Received", body "Received ₿ <amount> (<fiat>)" — NOT the old bare
+    "₿ <sats>" / "Via new channel".
 
     Precondition: onboarded regtest wallet connected to the LSP. A funded CJIT entry is ready to pay
     (see README.md). Background notifications DISABLED (so no foreground service survives the kill),
@@ -16,8 +18,7 @@
     <action>Wait up to ~30s for the FCM push to wake the node and deliver the notification</action>
     <action>Dump notifications: adb shell dumpsys notification --noredact | grep -A3 -i "to.bitkit"</action>
     <action>Verify EXACTLY ONE Bitkit notification is posted for this CJIT payment</action>
-    <action>Verify the amount is space-grouped, e.g. "₿ 48 064" — NOT "₿ 48064"</action>
-    <action>Verify the notification body is "Via new channel"</action>
+    <action>Verify the title is "Payment Received" and the body is "Received ₿ &lt;amount&gt; (&lt;fiat&gt;)" with the amount space-grouped (e.g. "Received ₿ 48 064 ($30.79)") — NOT a bare "₿ 48064" and NOT "Via new channel"</action>
     <action>Tap the notification to open the app and verify the received amount in the activity list matches</action>
   </actions>
 </journey>

journeys/cjit-notifications/non-cjit-channel-no-payment-notification.xml

@@ -1,9 +1,8 @@
 <journey name="non-cjit channel opening shows no payment notification">
   <description>
     Reproduces PR #787 issue #3 (🔴). Opening a regular (non-CJIT) Lightning channel must NOT be
-    reported as a received payment: no "₿ &lt;amount&gt; / Via new channel" notification, and never
-    several duplicates. When the app is in the foreground the only feedback is the in-app "Spending
-    balance ready" toast.
+    reported as a received payment: no "Payment Received" notification, and never several duplicates.
+    When the app is in the foreground the only feedback is the in-app "Spending balance ready" toast.
 
     Precondition: onboarded regtest wallet connected to the LSP, with a positive on-chain balance to
     fund the transfer. No CJIT entry is involved here — this is a manual/Transfer channel opening
@@ -16,7 +15,6 @@
     <action>Wait for the ChannelReady event (~5-10s)</action>
     <action>Verify an in-app "Spending balance ready" toast appears (testTag "SpendingBalanceReadyToast")</action>
     <action>Dump notifications: adb shell dumpsys notification --noredact | grep -A3 -i "to.bitkit"</action>
-    <action>Verify NO Bitkit notification with body "Via new channel" was posted</action>
     <action>Verify NO "Payment Received" notification was posted for this channel opening</action>
     <action>Verify there are not multiple duplicate channel-ready notifications stacked in the shade</action>
   </actions>