Compare commits

..

1 Commits

Author SHA1 Message Date
mkfain a38725f99c README: add test comment 2026-06-07 23:51:20 +00:00
388 changed files with 47501 additions and 22736 deletions
+5 -9
View File
@@ -1,10 +1,6 @@
# Project Overview
Agora is a peer-to-peer crowdfunding Nostr client built with React 19.x, TailwindCSS 3.x, Vite, shadcn/ui, and Nostrify, wrapped as a native iOS/Android app via Capacitor.
Donations are **on-chain Bitcoin** — donors pay a campaign's Bitcoin address directly. Agora ships an integrated **non-custodial HD Bitcoin wallet** (deterministically derived from the user's Nostr key) with BIP-86 Taproot and **BIP-352 silent-payment** support. The app never custodies or converts funds; it is a non-custodial UI that connects donors and campaigns peer-to-peer.
**This is not a Lightning project.** Lightning (`useZaps`, `useWallet`, `useNWC`, LNURL/NWC/WebLN) survives only as a secondary *tipping* path for notes/profiles and a deprecated Breez/Spark wallet in recovery-only mode — never for campaign donations. The crowdfunding core is strictly on-chain.
Agora is a Nostr client built with React 19.x, TailwindCSS 3.x, Vite, shadcn/ui, and Nostrify, wrapped as a native iOS/Android app via Capacitor.
## Technology Stack
@@ -21,7 +17,7 @@ Donations are **on-chain Bitcoin** — donors pay a campaign's Bitcoin address d
## Project Structure
- `/src/components/` — UI components. `ui/` holds shadcn primitives; `auth/` holds login components.
- `/src/hooks/` — custom hooks. Discover the full set with `ls src/hooks/`. Core Nostr: `useNostr`, `useAuthor`, `useCurrentUser`, `useNostrPublish`, `useUploadFile`, `useAppContext`, `useTheme`, `useToast`, `useLoggedInAccounts`, `useLoginActions`, `useIsMobile`. **On-chain wallet & crowdfunding (the headline feature):** `useHdWallet`, `useHdWalletSp` (BIP-352 silent payments), `useBitcoinSigner`, `useDonateCampaign`, `useCampaign`/`useCampaigns`, `useCampaignDonations`, `useOnchainZap`. **Lightning (secondary tipping only, not campaigns):** `useZaps`, `useWallet` (NWC/WebLN status — *not* the on-chain wallet), `useNWC`.
- `/src/hooks/` — custom hooks. Discover the full set with `ls src/hooks/`. Key ones: `useNostr`, `useAuthor`, `useCurrentUser`, `useNostrPublish`, `useUploadFile`, `useAppContext`, `useTheme`, `useToast`, `useLoggedInAccounts`, `useLoginActions`, `useIsMobile`, `useZaps`, `useWallet`, `useNWC`, `useShakespeare`.
- `/src/pages/` — page components wired into `AppRouter.tsx`. The catch-all `/:nip19` route is handled by `NIP19Page.tsx` (see the `nip19-routing` skill).
- `/src/lib/` — utility functions and shared logic.
- `/src/contexts/` — React context providers (`AppContext`, `NWCContext`).
@@ -266,16 +262,16 @@ The router provides automatic scroll-to-top on navigation and a 404 `NotFound` p
## Internationalization
All user-facing strings live in `src/locales/<lang>.json`. `en.json` is the source of truth; fifteen other locales ship alongside it: `ar`, `es`, `fa`, `fr`, `hi`, `id`, `km`, `ps`, `pt`, `ru`, `sn`, `sw`, `tr`, `zh`, `zh-Hant`.
All user-facing strings live in `src/locales/<lang>.json`. `en.json` is the source of truth; ten other locales ship alongside it: `ar`, `es`, `fa`, `fr`, `km`, `ps`, `pt`, `ru`, `sn`, `zh`.
**When you edit, add, or remove a translated string, update every locale in the same change — not just `en.json`.** Leaving the other locales stale ships an inconsistent app: users in other languages either see outdated copy or get an English fallback in the middle of a localized screen. This applies to FAQ entries, guide bodies, button labels, error messages — every value reachable through `t()`.
Concrete rules:
- **Edits to an existing key** — change the value in `en.json` first, then update the corresponding key in all fifteen other locales. Translate the new content into each language; don't paste English. Preserve `{{interpolation}}` placeholders, markdown links, and technical tokens (`sp1…`, `BIP-352`, kind numbers, etc.) verbatim.
- **Edits to an existing key** — change the value in `en.json` first, then update the corresponding key in all ten other locales. Translate the new content into each language; don't paste English. Preserve `{{interpolation}}` placeholders, markdown links, and technical tokens (`sp1…`, `BIP-352`, kind numbers, etc.) verbatim.
- **New keys** — add to `en.json` first, then add the same key with a translated value in every other locale. `src/test/locales.test.ts` fails the build if any locale ships a key that doesn't exist in `en.json`, but the inverse (a key missing from a non-English locale) is allowed and falls back to English at runtime — which is exactly the user-visible mess you're trying to avoid.
- **Removed keys** — delete from `en.json` and every other locale together. Leftover keys are dead translations and clutter future diffs.
- **Parallelize the translation work** — when updating one English string across all fifteen locales, dispatch the per-language edits to subagents in parallel rather than translating fifteen files sequentially. Provide each subagent the new English source, the existing translation snippet (so it matches established voice), and explicit instructions to preserve placeholders and technical tokens.
- **Parallelize the translation work** — when updating one English string across all ten locales, dispatch the per-language edits to subagents in parallel rather than translating ten files sequentially. Provide each subagent the new English source, the existing translation snippet (so it matches established voice), and explicit instructions to preserve placeholders and technical tokens.
Always run `npm run test` after locale changes — `locales.test.ts` catches structural drift, and the wider suite catches any `t()` calls that referenced a key you renamed.
-35
View File
@@ -1,40 +1,5 @@
# Changelog
## [2.9.1] - 2026-06-27
The Venezuela earthquake relief appeal now rallies behind every campaign on the ground, not just one. The home banner and relief page showcase a live, swipeable carousel of all Venezuelan relief efforts, with a running total of everything raised so far — so you can pick exactly who to help.
### Changed
- The Venezuela relief appeal now showcases every Venezuelan relief campaign in a live, auto-scrolling carousel you can swipe through, with a combined raised total across all of them, instead of featuring a single campaign.
## [2.9.0] - 2026-06-25
A big one. Private messaging arrives with a fast, searchable inbox you can reply to in your own language. Campaign organizers can now get verified by trusted reviewers through a guided sign-up, and verified badges appear right on campaigns. There's a new Venezuela earthquake relief appeal that takes you straight to donations, plus optional Tor routing on Android, separate Public and Private wallets, faster donation scanning, and refreshed profiles, settings, and login.
### Added
- Private direct messages: a dedicated inbox you can search by name, start new chats with inline recipient lookup, page back through old conversations, and read incoming messages translated into your language.
- Get verified: a guided sign-up for trusted reviewers to set up a verifier profile, publish a public "how we verify" statement, and vouch for campaigns. Verified badges now show on campaign pages, and a short tutorial walks you through it.
- A Venezuela earthquake relief appeal — a home-page banner, a one-time popup, and a shareable page that bakes in the relief campaign so you can read its story and donate without leaving.
- Optional Tor routing on Android for added privacy.
- Separate Public and Private wallets, keeping your spending and your private silent-payment funds cleanly apart.
- A "Don't have Bitcoin?" prompt on campaign pages that points first-time donors to Cash App.
- An always-visible language switcher in the top navigation, and a corporate sponsorship page.
### Changed
- Redesigned profiles with cleaner stats, a merged campaigns view, and a themed raised total.
- Redesigned Settings into an Apple-style grouped layout.
- Reworked the login and onboarding flow, including a new welcome screen built around the Agora brand.
- Silent-payment donations now scan faster and keep working in the background, with a progress bar on the private wallet.
- The home page now shows every featured campaign instead of capping the list.
### Fixed
- The audio, music, and podcast pages no longer crash.
- Backfilled and corrected translations across all sixteen languages.
## [2.8.9] - 2026-06-02
Adds an in-app prompt to grab the Android app from Zapstore, makes it easier to start or explore campaigns right from the home page, and irons out a batch of language and display fixes.
-57
View File
@@ -15,7 +15,6 @@
| 33863 | Campaign | Self-authored fundraising campaign with a single Bitcoin wallet endpoint (`bc1...` or `sp1...`) |
| 30385 | Community Stats Snapshot | Pre-computed per-country / global community leaderboards |
| 36639 | Pledge | Donor pledge for concrete submissions, stored as sats |
| 14672 | Verifier Statement | Self-authored statement describing how the author verifies campaigns (one per user) |
### Agora Protocols
@@ -741,62 +740,6 @@ Fold by `(coord, moderator)`, keeping the newest label per pair. A campaign is "
---
## Kind 14672: Verifier Statement
### Summary
Replaceable event kind for a **self-authored statement describing how the author verifies campaigns**. Anyone can "become a verifier" simply by publishing one of these events — there is no gatekeeper. The statement is a public, freeform explanation of the diligence process the author applies before vouching for a campaign, so donors can judge whether to trust that author's judgement.
Exactly one statement per user (replaceable, no `d` tag): publishing a new event replaces the previous one. Clients surface the statement prominently on the author's profile page.
This kind is **distinct from** the `agora.verified` campaign-verification labels (kind 1985, see Kind 33863 above). Those are moderator-signed, gated by the Team Soapbox follow pack, and vouch for one specific campaign. A kind 14672 statement is an open, self-published description of an author's *general* verification methodology and confers no special authority — it is a reputation signal donors read, not an access-control mechanism.
### Event Structure
```json
{
"kind": 14672,
"pubkey": "<author-pubkey>",
"content": "I personally visit each campaign organizer over video call, confirm their identity against a government ID, and cross-check the cause with at least two independent local sources before I vouch for it. ...",
"tags": [
["alt", "Verifier statement: how this account verifies campaigns"],
["t", "agora"]
]
}
```
### Content
The `content` field is the verifier statement, formatted as **Markdown**. Clients SHOULD render it with the same Markdown renderer they use for other long-form Agora content (campaign stories, policy pages). Empty or whitespace-only content means the author has **withdrawn** their verifier statement — clients MUST treat an empty-content event the same as no event (the author is no longer a verifier) and MUST NOT render a verifier section for it.
### Tags
| Tag | Required | Description |
|-------|-------------|-----------------------------------------------------------------------------|
| `alt` | Recommended | NIP-31 human-readable fallback describing the event's purpose. |
| `t` | Optional | Agora content marker (`t:agora`). Added at publish time via `withAgoraTag`. |
The statement carries no queryable fields beyond the author and kind — it is identified entirely by `(14672, pubkey)`.
### Querying
**Fetch a user's verifier statement:**
```json
{ "kinds": [14672], "authors": ["<pubkey>"], "limit": 1 }
```
Clients MUST filter by `authors` — a verifier statement only describes the diligence of the pubkey that signed it, so an unfiltered query would be meaningless (and would let anyone's statement be attributed to anyone).
### Client Behavior
- **Becoming a verifier:** a user publishes a kind 14672 event with their statement in `content`. No approval, allowlist, or moderation gate applies.
- **Withdrawing:** a user republishes the event with empty `content`, or publishes a NIP-09 kind 5 deletion referencing the event. Either way clients stop rendering the verifier section.
- **Rendering:** clients SHOULD surface the statement prominently on the author's profile (e.g. a dedicated "Verifier" section in the profile overview), rendering the Markdown content sanitized.
- **Editing:** because the kind is replaceable, the latest event per `(14672, pubkey)` wins. Clients performing an edit SHOULD pass the previous event as `prev` so `published_at` is preserved (NIP-23 convention).
---
## Kind 16769: Profile Tabs
+14 -16
View File
@@ -1,24 +1,24 @@
# Eranos
# Agora
Power to the people.
Eranos is a Nostr client focused on community ownership, expressive identity, and censorship resistance. This repository is the Eranos-branded app, a Grin-only fork of Agora (itself built from the Ditto codebase). It federates with the wider Nostr network - the search, labels, video, and zapstore routes are all live - with `relay.floonet.dev` as its home relay.
<!-- Test comment: verifying GitLab MR workflow -->
A mechanical Grin-only content policy runs at the edge: it drops the zap event kinds (9041, 9734, 9735) and redacts Lightning money-rail tokens (bolt11, lnurl, and `lightning:` URIs) from posts and DMs while keeping the rest of the message. Grin slatepacks and the Grin campaign kinds (33863, 36639, 3414) pass through untouched. Talking about bitcoin is never filtered - only the Lightning money rail is redacted. Web push is disabled.
Agora is a Nostr client focused on community ownership, expressive identity, and censorship resistance. This repository (`agora-3`) is the Agora-branded app built from the Ditto codebase.
**[eranos.fund](https://eranos.fund)** | **Upstream: [Agora](https://gitlab.com/soapbox-pub/agora-3)**
**[agora.spot](https://agora.spot)** | **[Source](https://gitlab.com/soapbox-pub/agora-3)**
## What This Repo Is
- Eranos product identity (name, theme, assets, native IDs)
- Agora product identity (name, theme, assets, native IDs)
- Ditto-derived implementation with broad Nostr feature coverage
- Configurable deployment defaults via `eranos.json`
- Configurable deployment defaults via `agora.json`
## Features
- **Community-first social client**: notes, articles, comments, reposts, reactions, and rich event rendering
- **Grin-only content policy**: federates with foreign relays but drops the Lightning zap kinds and redacts Lightning payment tokens, leaving Grin campaigns, slatepacks, and ordinary discussion (including talk about bitcoin) untouched
- **Theming system**: built-in presets + custom color/font/background themes that can be shared as events
- **Lightning support**: zaps with Nostr Wallet Connect and WebLN
- **Private messaging**: NIP-04 and NIP-17 direct messages
- **Mobile app shell**: Capacitor-powered Android/iOS wrappers
- **Self-hostable**: static web build + configurable relay and upload infrastructure
@@ -33,8 +33,8 @@ A mechanical Grin-only content policy runs at the edge: it drops the zap event k
### Development
```sh
git clone <this-repo>
cd eranos
git clone https://gitlab.com/soapbox-pub/agora-3.git
cd agora-3
npm install
npm run dev
```
@@ -46,8 +46,8 @@ Development server: `http://localhost:8080`
Use Docker Compose when you want the nginx reverse-proxy stack (necessary if you want decryptable media in messages - kind 15s of NIP 17):
```sh
git clone <this-repo>
cd eranos
git clone https://gitlab.com/soapbox-pub/agora-3.git
cd agora-3
cp .env.example .env
docker compose up --build
```
@@ -89,7 +89,7 @@ This runs type-checking, linting, unit tests, and production build checks.
## Configuration
Build-time config is read from `eranos.json` (gitignored by default so each deployment can provide its own values).
Build-time config is read from `agora.json` (gitignored by default so each deployment can provide its own values).
```jsonc
{
@@ -111,7 +111,7 @@ Build-time config is read from `eranos.json` (gitignored by default so each depl
Configuration priority (highest first):
1. User settings (local storage)
2. Build config (`eranos.json`)
2. Build config (`agora.json`)
3. Hardcoded app defaults
Use a custom config path:
@@ -122,7 +122,7 @@ CONFIG_FILE=./my-config.json npm run build
## Deployment
Eranos builds to static files and can be deployed to any static host.
Agora builds to static files and can be deployed to any static host.
- GitLab/GitHub Pages
- Netlify/Vercel
@@ -157,5 +157,3 @@ Read [CONTRIBUTING.md](CONTRIBUTING.md) before opening a merge request.
## License
[AGPL-3.0](LICENSE)
🤖 Built with AI pair-programming assistance (Claude)
+3 -62
View File
@@ -7,22 +7,15 @@ if (keystorePropertiesFile.exists()) {
}
android {
namespace = "fund.eranos.app"
namespace = "spot.agora.app"
compileSdk = rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "fund.eranos.app"
applicationId "spot.agora.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "2.9.1"
versionName "2.8.9"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// The arti-mobile AAR bundles large native Rust libraries for every
// ABI (~45 MB total). Restrict to the ABIs we actually ship/test:
// arm64-v8a + armeabi-v7a (real devices) and x86_64 (emulators).
// Drop x86_64 here if you only ever test on physical devices.
ndk {
abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
}
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
@@ -63,15 +56,6 @@ dependencies {
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
implementation project(':capacitor-android')
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
// Tor in Rust (arti) — prebuilt AAR from Guardian Project's gpmaven repo
// (source pinned to an immutable commit in the root build.gradle).
// Provides org.torproject.arti.ArtiProxy used by TorController.
// The resolved AAR is checksum-verified below (verifyArtiChecksum).
implementation 'org.torproject:arti-mobile:1.7.0.1'
// arti pulls androidx.webkit in transitively but only at runtime; we
// compile against ProxyController/WebViewFeature in TorController, so
// declare it explicitly on the app's compile classpath.
implementation "androidx.webkit:webkit:$androidxWebkitVersion"
testImplementation "junit:junit:$junitVersion"
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
@@ -80,49 +64,6 @@ dependencies {
apply from: 'capacitor.build.gradle'
// Supply-chain pin for the arti-mobile AAR. It carries a native library with
// network-proxy privileges and is sourced from Guardian Project's gpmaven repo,
// so we verify the resolved artifact's SHA-256 against a value pinned here.
// A mismatch fails the build before any APK is assembled. To bump arti, update
// the version + repo commit (root build.gradle) and replace this checksum after
// re-verifying a fresh download.
ext.artiMobileSha256 = 'cbdb34ce3cdb32f755f25f6dd05a2d1eb9a44025a17ec9202729816e2a3af05b'
task verifyArtiChecksum {
doLast {
def artifact = configurations.releaseRuntimeClasspath
.resolvedConfiguration
.resolvedArtifacts
.find { it.moduleVersion.id.group == 'org.torproject' && it.moduleVersion.id.name == 'arti-mobile' }
if (artifact == null) {
throw new GradleException("arti-mobile artifact not found on the runtime classpath; cannot verify Tor native library.")
}
def actual = java.security.MessageDigest.getInstance("SHA-256")
.digest(artifact.file.bytes)
.collect { String.format('%02x', it) }
.join('')
if (actual != project.ext.artiMobileSha256) {
throw new GradleException(
"arti-mobile AAR checksum mismatch!\n" +
" expected: ${project.ext.artiMobileSha256}\n" +
" actual: ${actual}\n" +
" file: ${artifact.file}\n" +
"Refusing to build a Tor proxy from an unverified native artifact."
)
}
logger.lifecycle("Verified arti-mobile AAR checksum (${actual}).")
}
}
afterEvaluate {
tasks.matching { it.name.startsWith('assemble') || it.name.startsWith('bundle') }.configureEach {
dependsOn verifyArtiChecksum
}
}
try {
def servicesJSON = file('google-services.json')
if (servicesJSON.text) {
+1 -5
View File
@@ -7,7 +7,7 @@
# Keep Capacitor classes (WebView JS bridge)
-keep class com.getcapacitor.** { *; }
-keep class fund.eranos.app.** { *; }
-keep class spot.agora.app.** { *; }
# Keep WebView JS interfaces
-keepclassmembers class * {
@@ -27,10 +27,6 @@
-keepattributes *Annotation*
-keep class com.outsystems.plugins.barcode.** { *; }
# Keep arti (Tor) classes ArtiJNI declares native methods invoked from the
# Rust .so via JNI, so its names must not be obfuscated/stripped.
-keep class org.torproject.arti.** { *; }
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
+2 -2
View File
@@ -24,12 +24,12 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<!-- Deep links: open eranos.fund URLs in the app -->
<!-- Deep links: open agora.spot URLs in the app -->
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="eranos.fund" />
<data android:scheme="https" android:host="agora.spot" />
</intent-filter>
</activity>
@@ -1,381 +0,0 @@
package fund.eranos.app;
import android.content.Context;
import android.content.SharedPreferences;
import android.util.Log;
import androidx.annotation.Nullable;
import androidx.webkit.ProxyConfig;
import androidx.webkit.ProxyController;
import androidx.webkit.WebViewFeature;
import org.json.JSONException;
import org.json.JSONObject;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.torproject.arti.ArtiProxy;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
/**
* Process-wide controller for the optional Tor (arti) mode on Android.
*
* <p>When enabled, this starts a local SOCKS5 proxy backed by arti (Tor in
* Rust) and — via {@link ArtiProxy.ArtiProxyBuilder#setWrapWebView(boolean)} —
* installs an Android {@code ProxyController} override so that <em>all</em>
* Capacitor WebView traffic (every {@code fetch} and relay {@code WebSocket})
* is routed through Tor. No changes to the TypeScript HTTP layer are needed.
*
* <p>The enabled flag is persisted to {@link SharedPreferences} by
* {@link TorPlugin} and read here at startup from {@link MainActivity}, so arti
* auto-starts on a cold launch <em>before</em> the WebView loads — there is no
* pre-bootstrap leak window. Beyond that, activation is live: the settings
* toggle calls {@link #start}/{@link #stop} (bridged through {@link TorPlugin}),
* which start or stop arti immediately while also updating the persisted flag.
*
* <p>Pluggable transports (obfs4 via IPtProxy) are intentionally not wired up
* yet — the builder already exposes {@code setObfs4Port}/{@code setBridgeLines}
* for a future censorship-resistance layer.
*/
public class TorController {
private static final String TAG = "TorController";
/** Local SOCKS5 port arti listens on (arti's own default). */
public static final int SOCKS_PORT = 9150;
static final String PREFS_NAME = "tor_config";
static final String KEY_ENABLED = "enabled";
/** Endpoint used to confirm a working Tor circuit (small JSON response). */
private static final String PROBE_URL = "https://check.torproject.org/api/ip";
// Re-verify continuously (gently) so the status reflects current reality.
private static final long PROBE_INTERVAL_SECONDS = 10;
/** After this long without a successful probe, surface a soft "failed". */
private static final long SOFT_TIMEOUT_SECONDS = 120;
// Status values mirrored to JS (see src/lib/tor.ts TorStatus).
public static final String STATUS_DISABLED = "disabled";
public static final String STATUS_CONNECTING = "connecting";
public static final String STATUS_CONNECTED = "connected";
public static final String STATUS_FAILED = "failed";
/** Receives status changes so the Capacitor plugin can forward them to JS. */
public interface StatusListener {
void onTorStatus(String status, int bootstrapPercent, @Nullable String error, @Nullable String exitIp);
}
private static volatile TorController instance;
private final Object lock = new Object();
private final AtomicBoolean started = new AtomicBoolean(false);
private ArtiProxy artiProxy;
private ScheduledExecutorService scheduler;
private volatile String status = STATUS_DISABLED;
private volatile int bootstrapPercent = 0;
@Nullable private volatile String error = null;
/** Tor exit-node IP from the last successful check (for verification UI). */
@Nullable private volatile String exitIp = null;
/** Consecutive failed probes; used to debounce CONNECTED -> reconnecting. */
private int consecutiveFailures = 0;
@Nullable private volatile StatusListener listener;
private volatile long startedAtMs = 0;
private TorController() {}
public static TorController getInstance() {
if (instance == null) {
synchronized (TorController.class) {
if (instance == null) {
instance = new TorController();
}
}
}
return instance;
}
/** Whether Tor is enabled in persisted preferences (read at cold-launch startup). */
public static boolean isEnabled(Context context) {
SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
return prefs.getBoolean(KEY_ENABLED, false);
}
/**
* Persist the enabled flag only. This controls whether arti auto-starts on
* the next cold launch; it does not start or stop arti now. For live
* activation call {@link #start}/{@link #stop}, which also persist the flag.
*/
public static void setEnabled(Context context, boolean enabled) {
context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
.edit()
.putBoolean(KEY_ENABLED, enabled)
.apply();
}
public void setListener(@Nullable StatusListener listener) {
this.listener = listener;
// Replay the current status so a freshly-attached listener is in sync.
if (listener != null) {
listener.onTorStatus(status, bootstrapPercent, error, exitIp);
}
}
public String getStatus() {
return status;
}
public int getBootstrapPercent() {
return bootstrapPercent;
}
@Nullable
public String getError() {
return error;
}
@Nullable
public String getExitIp() {
return exitIp;
}
/**
* Start arti and install the WebView proxy override. Idempotent: a second
* call while already running is a no-op. Heavy work runs off the caller's
* thread so this is safe to invoke from {@code MainActivity.onCreate}.
*/
public void start(Context context) {
if (!started.compareAndSet(false, true)) {
return;
}
final Context appContext = context.getApplicationContext();
exitIp = null;
consecutiveFailures = 0;
// Install the fail-closed WebView proxy override synchronously, BEFORE
// the WebView loads (start() is called from MainActivity.onCreate ahead
// of super.onCreate). With no direct fallback, any request that arti
// can't carry fails instead of leaking out directly — even during the
// bootstrap window when arti isn't connected yet.
applyWebViewProxy();
updateStatus(STATUS_CONNECTING, 0, null);
startedAtMs = System.currentTimeMillis();
Thread t = new Thread(() -> {
try {
synchronized (lock) {
// NB: we do NOT use setWrapWebView(true) — arti's helper
// appends a DIRECT fallback (fail-open). We set our own
// fail-closed override in applyWebViewProxy() instead.
artiProxy = ArtiProxy.Builder(appContext)
.setSocksPort(SOCKS_PORT)
.setLogListener(this::onArtiLog)
.build();
artiProxy.start();
}
Log.d(TAG, "arti started on socks://127.0.0.1:" + SOCKS_PORT);
beginConnectivityProbe();
} catch (Throwable e) {
Log.e(TAG, "Failed to start arti", e);
updateStatus(STATUS_FAILED, bootstrapPercent, String.valueOf(e.getMessage()));
}
}, "arti-start");
t.setDaemon(true);
t.start();
}
/** Stop arti and route the WebView back to a direct connection. Safe to
* call live (toggle off) — clears the SOCKS proxy override so traffic
* doesn't get stranded on the now-stopped proxy. */
public void stop() {
// Remove the WebView SOCKS override first so new requests go direct.
clearWebViewProxy();
synchronized (lock) {
if (scheduler != null) {
scheduler.shutdownNow();
scheduler = null;
}
if (artiProxy != null) {
try {
artiProxy.stop();
} catch (Throwable e) {
Log.w(TAG, "Error stopping arti", e);
}
artiProxy = null;
}
}
started.set(false);
exitIp = null;
updateStatus(STATUS_DISABLED, 0, null);
}
/** Re-run the connectivity probe (used by a "Retry" action in the gate). */
public void retry() {
if (!started.get()) {
return;
}
consecutiveFailures = 0;
startedAtMs = System.currentTimeMillis();
if (!STATUS_CONNECTED.equals(status)) {
updateStatus(STATUS_CONNECTING, bootstrapPercent, null);
}
beginConnectivityProbe();
}
// --- internals -------------------------------------------------------
/**
* Route the WebView through arti's SOCKS proxy, FAIL-CLOSED. There is no
* {@code addDirect()} fallback, so when Tor can't carry a request it fails
* rather than leaking to a direct connection. localhost is bypassed (it's
* the local Capacitor asset server, never remote traffic).
*/
private void applyWebViewProxy() {
try {
if (WebViewFeature.isFeatureSupported(WebViewFeature.PROXY_OVERRIDE)) {
ProxyConfig config = new ProxyConfig.Builder()
.addProxyRule("socks://127.0.0.1:" + SOCKS_PORT)
// No addDirect() — fail closed.
.addBypassRule("localhost")
.addBypassRule("127.0.0.1")
.build();
ProxyController.getInstance().setProxyOverride(config, Runnable::run, () -> {});
}
} catch (Throwable e) {
Log.w(TAG, "Error applying WebView proxy override", e);
}
}
/** Remove the app-wide WebView SOCKS proxy override so the WebView reverts
* to a direct connection. */
private void clearWebViewProxy() {
try {
if (WebViewFeature.isFeatureSupported(WebViewFeature.PROXY_OVERRIDE)) {
ProxyController.getInstance().clearProxyOverride(Runnable::run, () -> {});
}
} catch (Throwable e) {
Log.w(TAG, "Error clearing WebView proxy override", e);
}
}
private static final Pattern PERCENT = Pattern.compile("(\\d{1,3})\\s*%");
private void onArtiLog(String line) {
if (line == null) return;
Log.d("artilog", line);
// Best-effort bootstrap progress for the UI. arti's log format isn't a
// stable API, so the connectivity probe (below) remains authoritative
// for the definitive "connected" signal.
Matcher m = PERCENT.matcher(line);
if (m.find()) {
try {
int pct = Integer.parseInt(m.group(1));
if (pct >= 0 && pct <= 100 && pct >= bootstrapPercent
&& !STATUS_CONNECTED.equals(status)) {
updateStatus(STATUS_CONNECTING, pct, null);
}
} catch (NumberFormatException ignored) {
}
}
}
private void beginConnectivityProbe() {
synchronized (lock) {
if (scheduler != null) {
scheduler.shutdownNow();
}
scheduler = Executors.newSingleThreadScheduledExecutor(r -> {
Thread th = new Thread(r, "tor-probe");
th.setDaemon(true);
return th;
});
final ScheduledExecutorService s = scheduler;
final OkHttpClient client = new OkHttpClient.Builder()
.proxy(new Proxy(Proxy.Type.SOCKS, new InetSocketAddress("127.0.0.1", SOCKS_PORT)))
.connectTimeout(20, TimeUnit.SECONDS)
.readTimeout(20, TimeUnit.SECONDS)
.build();
// Probe continuously (no shutdown on success). check.torproject.org
// reports whether the request actually exited via Tor, so we only
// report CONNECTED when IsTor is true — and we keep re-verifying so a
// dropped circuit downgrades the status instead of lying.
s.scheduleWithFixedDelay(() -> {
Request req = new Request.Builder()
.url(PROBE_URL)
.header("Accept", "application/json")
.build();
try (Response resp = client.newCall(req).execute()) {
String body = resp.body() != null ? resp.body().string() : "";
boolean isTor = false;
String ip = null;
try {
JSONObject json = new JSONObject(body);
isTor = json.optBoolean("IsTor", false);
ip = json.has("IP") ? json.optString("IP", null) : null;
} catch (JSONException ignored) {
// Non-JSON response — treat as not-via-Tor below.
}
if (resp.isSuccessful() && isTor) {
consecutiveFailures = 0;
exitIp = ip;
updateStatus(STATUS_CONNECTED, 100, null);
} else if (resp.isSuccessful()) {
// Reached the internet but NOT through Tor — a leak/bypass.
// This should not happen with the SOCKS proxy, but report
// it honestly rather than claiming a Tor connection.
consecutiveFailures = 0;
exitIp = ip;
updateStatus(STATUS_FAILED, bootstrapPercent,
"Connected to the internet, but not through Tor.");
} else {
handleProbeFailure();
}
} catch (Exception e) {
handleProbeFailure();
}
}, 0, PROBE_INTERVAL_SECONDS, TimeUnit.SECONDS);
}
}
/** A probe couldn't reach Tor. Debounce CONNECTED, surface FAILED after the
* soft timeout while still connecting. */
private void handleProbeFailure() {
consecutiveFailures++;
if (STATUS_CONNECTED.equals(status)) {
// Tolerate a couple of transient blips before downgrading.
if (consecutiveFailures >= 3) {
exitIp = null;
updateStatus(STATUS_CONNECTING, bootstrapPercent,
"Lost the Tor circuit; reconnecting…");
}
return;
}
long elapsed = (System.currentTimeMillis() - startedAtMs) / 1000;
if (elapsed >= SOFT_TIMEOUT_SECONDS && !STATUS_FAILED.equals(status)) {
updateStatus(STATUS_FAILED, bootstrapPercent,
"Couldn't reach the Tor network. Your network may be blocking Tor.");
}
}
private void updateStatus(String newStatus, int percent, @Nullable String err) {
this.status = newStatus;
this.bootstrapPercent = percent;
this.error = err;
StatusListener l = this.listener;
if (l != null) {
l.onTorStatus(newStatus, percent, err, exitIp);
}
}
}
@@ -1,102 +0,0 @@
package fund.eranos.app;
import com.getcapacitor.JSObject;
import com.getcapacitor.Plugin;
import com.getcapacitor.PluginCall;
import com.getcapacitor.PluginMethod;
import com.getcapacitor.annotation.CapacitorPlugin;
/**
* Capacitor bridge for the Tor (arti) mode.
*
* <p>Mirrors {@link DittoNotificationPlugin}'s pattern: JS configures native
* state, native owns the work. On a cold launch arti auto-starts from
* {@link MainActivity} based on the persisted flag. At runtime the settings
* toggle activates Tor live via {@link #start}/{@link #stop}, which start or
* stop arti immediately and update the persisted flag. ({@link #setEnabled}
* persists the flag only, without touching the running proxy.) Live bootstrap
* status is pushed to JS via the {@code torStatus} event.
*
* <p>JS interface: see {@code src/lib/tor.ts}.
*/
@CapacitorPlugin(name = "Tor")
public class TorPlugin extends Plugin {
private static final String EVENT_STATUS = "torStatus";
@Override
public void load() {
// Forward native status changes to JS listeners. Attaching also replays
// the current status, keeping a newly-mounted JS gate in sync.
TorController.getInstance().setListener((status, bootstrapPercent, error, exitIp) -> {
JSObject data = new JSObject();
data.put("status", status);
data.put("bootstrapPercent", bootstrapPercent);
data.put("error", error);
data.put("exitIp", exitIp);
notifyListeners(EVENT_STATUS, data);
});
}
/** Whether Tor is enabled in persisted preferences. */
@PluginMethod
public void isEnabled(PluginCall call) {
JSObject ret = new JSObject();
ret.put("enabled", TorController.isEnabled(getContext()));
call.resolve(ret);
}
/**
* Persist the enabled flag only, without starting or stopping arti now.
* Controls whether arti auto-starts on the next cold launch. For live
* activation use {@link #start}/{@link #stop}.
*/
@PluginMethod
public void setEnabled(PluginCall call) {
Boolean enabled = call.getBoolean("enabled");
if (enabled == null) {
call.reject("Missing 'enabled' boolean");
return;
}
TorController.setEnabled(getContext(), enabled);
call.resolve();
}
/** Start arti now (live activation). Also persists enabled=true so it
* auto-starts on the next cold launch. */
@PluginMethod
public void start(PluginCall call) {
TorController.setEnabled(getContext(), true);
TorController.getInstance().start(getContext());
call.resolve();
}
/** Stop arti now (live deactivation) and clear the WebView proxy. Also
* persists enabled=false. */
@PluginMethod
public void stop(PluginCall call) {
TorController.setEnabled(getContext(), false);
TorController.getInstance().stop();
call.resolve();
}
/** Current connection status (synchronous snapshot). */
@PluginMethod
public void getStatus(PluginCall call) {
TorController controller = TorController.getInstance();
JSObject ret = new JSObject();
ret.put("enabled", TorController.isEnabled(getContext()));
ret.put("status", controller.getStatus());
ret.put("bootstrapPercent", controller.getBootstrapPercent());
ret.put("error", controller.getError());
ret.put("exitIp", controller.getExitIp());
call.resolve(ret);
}
/** Re-run the connectivity probe (for a "Retry" action in the gate). */
@PluginMethod
public void retry(PluginCall call) {
TorController.getInstance().retry();
call.resolve();
}
}
@@ -1,4 +1,4 @@
package fund.eranos.app;
package spot.agora.app;
import android.app.ForegroundServiceStartNotAllowedException;
import android.content.Context;
@@ -1,4 +1,4 @@
package fund.eranos.app;
package spot.agora.app;
import android.app.ForegroundServiceStartNotAllowedException;
import android.content.Context;
@@ -25,14 +25,6 @@ public class MainActivity extends BridgeActivity {
protected void onCreate(Bundle savedInstanceState) {
// Register native plugins before super.onCreate.
registerPlugin(DittoNotificationPlugin.class);
registerPlugin(TorPlugin.class);
// If the user enabled Tor (apply on relaunch), start arti BEFORE
// super.onCreate so the WebView SOCKS proxy override is installed
// before the WebView issues any network request no leak window.
if (TorController.isEnabled(this)) {
TorController.getInstance().start(getApplicationContext());
}
super.onCreate(savedInstanceState);
@@ -106,7 +98,7 @@ public class MainActivity extends BridgeActivity {
private void handleNotificationIntent(Intent intent) {
if (intent == null) return;
Uri data = intent.getData();
if (data != null && "eranos.fund".equals(data.getHost())) {
if (data != null && "agora.spot".equals(data.getHost())) {
String path = data.getPath();
if (path != null && !path.isEmpty()) {
// Wait for WebView to be ready, then navigate
@@ -1,4 +1,4 @@
package fund.eranos.app;
package spot.agora.app;
import android.app.NotificationChannel;
import android.app.NotificationManager;
@@ -337,7 +337,7 @@ public class NostrPoller {
if (manager == null) return;
Intent intent = new Intent(context, MainActivity.class);
intent.setData(Uri.parse("https://eranos.fund/notifications"));
intent.setData(Uri.parse("https://agora.spot/notifications"));
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
PendingIntent pendingIntent = PendingIntent.getActivity(
context, id, intent,
@@ -1,4 +1,4 @@
package fund.eranos.app;
package spot.agora.app;
import android.app.AlarmManager;
import android.app.ForegroundServiceStartNotAllowedException;
@@ -83,7 +83,7 @@ public class NotificationRelayService extends Service {
// + REQ + up to 5 events + EOSE + metadata fetch + disconnect.
private static final long FETCH_WAKELOCK_TIMEOUT_MS = 30_000;
private static final String ACTION_FETCH = "fund.eranos.app.ACTION_FETCH";
private static final String ACTION_FETCH = "spot.agora.app.ACTION_FETCH";
// Backoff bounds for relay connect failures (separate from alarm interval).
private static final long INITIAL_BACKOFF_MS = 1_000;
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 762 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 652 B

After

Width:  |  Height:  |  Size: 487 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 839 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 751 B

After

Width:  |  Height:  |  Size: 637 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 652 B

After

Width:  |  Height:  |  Size: 487 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

+4 -4
View File
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">Eranos</string>
<string name="title_activity_main">Eranos</string>
<string name="package_name">fund.eranos.app</string>
<string name="custom_url_scheme">fund.eranos.app</string>
<string name="app_name">Agora</string>
<string name="title_activity_main">Agora</string>
<string name="package_name">spot.agora.app</string>
<string name="custom_url_scheme">spot.agora.app</string>
</resources>
-12
View File
@@ -21,18 +21,6 @@ allprojects {
repositories {
google()
mavenCentral()
// Guardian Project's experimental Maven repo, hosting the prebuilt
// org.torproject:arti-mobile AAR (Tor in Rust) used for the optional Tor mode.
//
// Pinned to an immutable commit SHA rather than the mutable `master`
// branch: this artifact ships a native library with network-proxy
// privileges, so we don't want a force-push or new commit to gpmaven
// silently changing what we resolve. To bump arti, update both the
// commit below and the checksum pin in `app/build.gradle`, and re-verify
// the SHA-256 against a fresh download.
//
// Commit: guardianproject/gpmaven@b3ee2a63eec4ce37ea22fcc6b1ff009f406f2b13
maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/b3ee2a63eec4ce37ea22fcc6b1ff009f406f2b13" }
}
}
-2171
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -1,8 +1,8 @@
import type { CapacitorConfig } from '@capacitor/cli';
const config: CapacitorConfig = {
appId: 'fund.eranos.app',
appName: 'Eranos',
appId: 'spot.agora.app',
appName: 'Agora',
webDir: 'dist',
server: {
androidScheme: 'https',
@@ -16,7 +16,7 @@ const config: CapacitorConfig = {
ios: {
backgroundColor: '#14161f',
contentInset: 'never',
scheme: 'Eranos'
scheme: 'Agora'
},
};
+3 -3
View File
@@ -10,7 +10,7 @@ services:
depends_on:
- vite
networks:
- eranos-network
- agora-network
vite:
image: node:22-alpine
@@ -22,9 +22,9 @@ services:
environment:
- NODE_ENV=development
networks:
- eranos-network
- agora-network
restart: unless-stopped
networks:
eranos-network:
agora-network:
driver: bridge
+9 -9
View File
@@ -1,27 +1,27 @@
<!DOCTYPE html>
<html lang="en" class="dark">
<head>
<title>Eranos — Power to the people.</title>
<title>Agora — Power to the people.</title>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover, interactive-widget=resizes-content" />
<meta name="description" content="Eranos — a peer-to-peer crowdfunding app on Nostr. Fund campaigns directly with Grin, no middlemen." />
<meta name="description" content="Agora — a Nostr social client for communities, creativity, and ownership." />
<!-- Open Graph -->
<meta property="og:title" content="Eranos" />
<meta property="og:title" content="Agora" />
<meta property="og:description" content="Power to the people." />
<meta property="og:image" content="https://eranos.fund/og-image.jpg" />
<meta property="og:image" content="https://agora.spot/og-image.jpg" />
<meta property="og:image:width" content="1200" />
<meta property="og:image:height" content="630" />
<meta property="og:image:type" content="image/jpeg" />
<meta property="og:type" content="website" />
<meta property="og:url" content="https://eranos.fund" />
<meta property="og:site_name" content="Eranos" />
<meta property="og:url" content="https://agora.spot" />
<meta property="og:site_name" content="Agora" />
<!-- Twitter / X -->
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:title" content="Eranos" />
<meta name="twitter:title" content="Agora" />
<meta name="twitter:description" content="Power to the people." />
<meta name="twitter:image" content="https://eranos.fund/og-image.jpg" />
<meta name="twitter:image" content="https://agora.spot/og-image.jpg" />
<meta http-equiv="content-security-policy" content="default-src 'none'; script-src 'self' 'wasm-unsafe-eval'; worker-src 'self' blob:; child-src 'self' blob:; style-src 'self' 'unsafe-inline'; frame-src 'self' https:; font-src 'self' https:; base-uri 'self'; manifest-src 'self'; connect-src 'self' blob: https: wss:; img-src 'self' data: blob: https:; media-src 'self' blob: https:">
<link rel="icon" type="image/x-icon" href="/favicon.ico">
@@ -29,7 +29,7 @@
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32.png">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<meta name="theme-color" content="#0a0c14" media="(prefers-color-scheme: dark)">
<meta name="theme-color" content="#faa805" media="(prefers-color-scheme: light)">
<meta name="theme-color" content="#ff6600" media="(prefers-color-scheme: light)">
<link rel="manifest" href="/manifest.webmanifest">
<style>@keyframes agora-spin{to{transform:rotate(360deg)}}</style>
</head>
+4 -4
View File
@@ -323,9 +323,9 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.9.1;
MARKETING_VERSION = 2.8.9;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = fund.eranos.app;
PRODUCT_BUNDLE_IDENTIFIER = spot.agora.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 5.0;
@@ -347,8 +347,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.9.1;
PRODUCT_BUNDLE_IDENTIFIER = fund.eranos.app;
MARKETING_VERSION = 2.8.9;
PRODUCT_BUNDLE_IDENTIFIER = spot.agora.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
SWIFT_VERSION = 5.0;
+2 -2
View File
@@ -4,8 +4,8 @@
<dict>
<key>com.apple.developer.associated-domains</key>
<array>
<string>webcredentials:eranos.fund</string>
<string>webcredentials:eranos.fund?mode=developer</string>
<string>webcredentials:agora.spot</string>
<string>webcredentials:agora.spot?mode=developer</string>
</array>
</dict>
</plist>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 40 KiB

+1 -1
View File
@@ -33,7 +33,7 @@ public class DittoNotificationPlugin: CAPPlugin, CAPBridgedPlugin {
// MARK: - Constants
static let bgTaskIdentifier = "fund.eranos.app.notification-refresh"
static let bgTaskIdentifier = "spot.agora.app.notification-refresh"
private static let prefsKey = "ditto_notification_config"
// MARK: - Plugin Methods
+5 -5
View File
@@ -7,7 +7,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>Eranos</string>
<string>Agora</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
@@ -48,11 +48,11 @@
<key>UIViewControllerBasedStatusBarAppearance</key>
<true/>
<key>NSPhotoLibraryUsageDescription</key>
<string>Eranos needs access to your photo library to upload images to your posts and profile.</string>
<string>Agora needs access to your photo library to upload images to your posts and profile.</string>
<key>NSCameraUsageDescription</key>
<string>Eranos needs camera access to take photos and videos for your posts, and to scan QR codes.</string>
<string>Agora needs camera access to take photos and videos for your posts, and to scan QR codes when sending Bitcoin.</string>
<key>NSMicrophoneUsageDescription</key>
<string>Eranos needs access to your microphone to record voice messages.</string>
<string>Agora needs access to your microphone to record voice messages.</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>UIBackgroundModes</key>
@@ -61,7 +61,7 @@
</array>
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>fund.eranos.app.notification-refresh</string>
<string>spot.agora.app.notification-refresh</string>
</array>
</dict>
</plist>
+1 -1
View File
@@ -1,2 +1,2 @@
app_identifier("fund.eranos.app")
app_identifier("spot.agora.app")
team_id("GZLTTH5DLM")
+5 -5
View File
@@ -3,7 +3,7 @@ default_platform(:ios)
platform :ios do
# ─── Lanes ────────────────────────────────────────────────────────────
desc "Build and sign the App Store IPA. Output at ../artifacts/Eranos.ipa."
desc "Build and sign the App Store IPA. Output at ../artifacts/Agora.ipa."
lane :build_ipa do
setup_lane_signing!
build_release_ipa!
@@ -19,7 +19,7 @@ platform :ios do
submit_release_for_review!(ipa_path)
end
desc "Build, sign, and submit Eranos to the App Store for review (single-step convenience)."
desc "Build, sign, and submit Agora to the App Store for review (single-step convenience)."
lane :release do
setup_lane_signing!
build_release_ipa!
@@ -83,7 +83,7 @@ platform :ios do
configuration: "Release",
export_method: "app-store",
output_directory: "../artifacts",
output_name: "Eranos.ipa",
output_name: "Agora.ipa",
clean: true,
# Override the Xcode project's Automatic signing for this build only.
# Match has already installed the AppStore cert + profile into the
@@ -93,7 +93,7 @@ platform :ios do
xcargs: [
"CODE_SIGN_STYLE=Manual",
"CODE_SIGN_IDENTITY='Apple Distribution'",
"PROVISIONING_PROFILE_SPECIFIER='match AppStore fund.eranos.app'",
"PROVISIONING_PROFILE_SPECIFIER='match AppStore spot.agora.app'",
"DEVELOPMENT_TEAM=GZLTTH5DLM",
].join(" "),
export_options: {
@@ -101,7 +101,7 @@ platform :ios do
signingStyle: "manual",
teamID: "GZLTTH5DLM",
provisioningProfiles: {
"fund.eranos.app" => "match AppStore fund.eranos.app",
"spot.agora.app" => "match AppStore spot.agora.app",
},
},
)
+1 -1
View File
@@ -1,5 +1,5 @@
git_url("https://gitlab.com/soapbox-pub/certificates.git")
storage_mode("git")
type("appstore")
app_identifier(["fund.eranos.app"])
app_identifier(["spot.agora.app"])
team_id("GZLTTH5DLM")
+3700 -1900
View File
File diff suppressed because it is too large Load Diff
+12 -6
View File
@@ -1,7 +1,7 @@
{
"name": "eranos",
"name": "agora",
"private": true,
"version": "2.9.1",
"version": "2.8.9",
"type": "module",
"scripts": {
"dev": "npm i --silent && vite",
@@ -15,6 +15,7 @@
"node": ">=22"
},
"dependencies": {
"@breeztech/breez-sdk-spark": "^0.10.0",
"@capacitor/app": "^8.0.0",
"@capacitor/barcode-scanner": "^3.0.2",
"@capacitor/core": "^8.1.0",
@@ -43,6 +44,7 @@
"@fontsource/pirata-one": "^5.2.8",
"@fontsource/silkscreen": "^5.2.8",
"@fontsource/special-elite": "^5.2.8",
"@getalby/sdk": "^5.1.1",
"@hookform/resolvers": "^5.2.2",
"@milkdown/core": "^7.20.0",
"@milkdown/ctx": "^7.20.0",
@@ -55,11 +57,10 @@
"@milkdown/prose": "^7.20.0",
"@milkdown/react": "^7.20.0",
"@milkdown/utils": "^7.20.0",
"@noble/curves": "^1.2.0",
"@noble/curves": "^2.2.0",
"@noble/hashes": "^1.8.0",
"@scure/base": "^1.1.1",
"@nostrify/nostrify": "^0.53.0",
"@nostrify/react": "^0.6.3",
"@nostrify/nostrify": "^0.52.2",
"@nostrify/react": "^0.6.2",
"@nostrify/types": "^0.37.0",
"@plausible-analytics/tracker": "^0.4.4",
"@radix-ui/react-accordion": "^1.2.0",
@@ -85,6 +86,10 @@
"@radix-ui/react-toggle": "^1.1.0",
"@radix-ui/react-toggle-group": "^1.1.0",
"@radix-ui/react-tooltip": "^1.2.8",
"@scure/base": "^1.1.1",
"@scure/bip32": "^2.2.0",
"@scure/bip39": "^1.6.0",
"@scure/btc-signer": "^2.2.0",
"@sentry/react": "^10.42.0",
"@tanstack/react-query": "^5.56.2",
"@unhead/addons": "^2.1.13",
@@ -144,6 +149,7 @@
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^6.0.1",
"@webbtc/webln-types": "^3.0.0",
"autoprefixer": "^10.4.20",
"eslint": "^9.9.0",
"eslint-plugin-react-hooks": "^5.1.0-rc.0",
-35
View File
@@ -1,40 +1,5 @@
# Changelog
## [2.9.1] - 2026-06-27
The Venezuela earthquake relief appeal now rallies behind every campaign on the ground, not just one. The home banner and relief page showcase a live, swipeable carousel of all Venezuelan relief efforts, with a running total of everything raised so far — so you can pick exactly who to help.
### Changed
- The Venezuela relief appeal now showcases every Venezuelan relief campaign in a live, auto-scrolling carousel you can swipe through, with a combined raised total across all of them, instead of featuring a single campaign.
## [2.9.0] - 2026-06-25
A big one. Private messaging arrives with a fast, searchable inbox you can reply to in your own language. Campaign organizers can now get verified by trusted reviewers through a guided sign-up, and verified badges appear right on campaigns. There's a new Venezuela earthquake relief appeal that takes you straight to donations, plus optional Tor routing on Android, separate Public and Private wallets, faster donation scanning, and refreshed profiles, settings, and login.
### Added
- Private direct messages: a dedicated inbox you can search by name, start new chats with inline recipient lookup, page back through old conversations, and read incoming messages translated into your language.
- Get verified: a guided sign-up for trusted reviewers to set up a verifier profile, publish a public "how we verify" statement, and vouch for campaigns. Verified badges now show on campaign pages, and a short tutorial walks you through it.
- A Venezuela earthquake relief appeal — a home-page banner, a one-time popup, and a shareable page that bakes in the relief campaign so you can read its story and donate without leaving.
- Optional Tor routing on Android for added privacy.
- Separate Public and Private wallets, keeping your spending and your private silent-payment funds cleanly apart.
- A "Don't have Bitcoin?" prompt on campaign pages that points first-time donors to Cash App.
- An always-visible language switcher in the top navigation, and a corporate sponsorship page.
### Changed
- Redesigned profiles with cleaner stats, a merged campaigns view, and a themed raised total.
- Redesigned Settings into an Apple-style grouped layout.
- Reworked the login and onboarding flow, including a new welcome screen built around the Agora brand.
- Silent-payment donations now scan faster and keep working in the background, with a progress bar on the private wallet.
- The home page now shows every featured campaign instead of capping the list.
### Fixed
- The audio, music, and podcast pages no longer crash.
- Backfilled and corrected translations across all sixteen languages.
## [2.8.9] - 2026-06-02
Adds an in-app prompt to grab the Android app from Zapstore, makes it easier to start or explore campaigns right from the home page, and irons out a batch of language and display fixes.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 448 B

After

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 985 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 272 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 36 KiB

+5 -1
View File
File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 303 B

+10 -4
View File
@@ -1,11 +1,11 @@
{
"name": "Eranos",
"short_name": "Eranos",
"name": "Agora",
"short_name": "Agora",
"description": "Power to the people. Organize, create, and connect across the open Nostr network.",
"start_url": "/",
"display": "standalone",
"background_color": "#0a0c14",
"theme_color": "#faa805",
"theme_color": "#ff6600",
"icons": [
{
"src": "/icon-192.png",
@@ -38,6 +38,12 @@
"purpose": "any"
}
],
"related_applications": [],
"related_applications": [
{
"platform": "play",
"url": "https://play.google.com/store/apps/details?id=spot.agora.app",
"id": "spot.agora.app"
}
],
"prefer_related_applications": false
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 124 KiB

+6 -6
View File
@@ -1,5 +1,5 @@
/**
* Eranos Service Worker
* Agora Service Worker
*
* Handles incoming Web Push notifications from the nostr-push server and
* opens/focuses the app when the user taps a notification.
@@ -14,17 +14,17 @@ self.addEventListener('push', (event) => {
try {
payload = event.data.json();
} catch {
payload = { title: 'Eranos', body: event.data.text() };
payload = { title: 'Agora', body: event.data.text() };
}
const title = payload.title ?? 'Eranos';
const title = payload.title ?? 'Agora';
const options = {
body: payload.body ?? '',
icon: payload.icon ?? '/icon-192.png',
badge: payload.badge ?? '/icon-192.png',
data: payload.data ?? {},
requireInteraction: false,
tag: payload.data?.subscription_id ?? 'eranos-notification',
tag: payload.data?.subscription_id ?? 'agora-notification',
renotify: true,
};
@@ -42,7 +42,7 @@ self.addEventListener('notificationclick', (event) => {
self.clients
.matchAll({ type: 'window', includeUncontrolled: true })
.then((clientList) => {
// Focus an existing Eranos tab if one is open
// Focus an existing Agora tab if one is open
for (const client of clientList) {
if (new URL(client.url).origin === self.location.origin) {
client.navigate('/notifications');
@@ -58,7 +58,7 @@ self.addEventListener('notificationclick', (event) => {
// --- Activate immediately ---
//
// On activate:
// 1. Wipe every Cache Storage entry. A previous version of Eranos deployed
// 1. Wipe every Cache Storage entry. A previous version of Agora deployed
// a precaching service worker (Workbox-style) that's still serving stale
// HTML/JS to returning users on this origin. Clearing caches means future
// requests bypass anything the old SW left behind.
+1 -1
View File
@@ -2,7 +2,7 @@
// preloader background before first paint. Runs as a blocking <script> so
// there's no flash of the wrong theme.
//
// Eranos's colors are hardcoded in src/index.css via :root {} and .dark {}
// Agora's colors are hardcoded in src/index.css via :root {} and .dark {}
// blocks. There is no custom-theme branch; the only thing this script
// does is set the right class on <html> and paint the preloader with the
// matching background + primary color so the page doesn't flash white
+6 -7
View File
@@ -55,17 +55,16 @@ COLORED_SVG="$TMPDIR/logo_colored.svg"
RAW_PNG="$TMPDIR/raw.png"
MASTER_PNG="$TMPDIR/master.png"
# The phoenix logo.svg carries its own brand yellow (#fcd414); the sed only
# recolors legacy black-fill sources, so it's a no-op for the phoenix.
# Recolor the SVG's black fill to the brand color, on transparent background.
sed 's/fill="black"/fill="'"$LOGO_COLOR"'"/g' "$SOURCE_SVG" > "$COLORED_SVG"
# The SVG's viewBox is 1446x1246 (wider than tall). Render at its native
# aspect ratio first so we don't squish the logo vertically.
# The SVG's viewBox is 720x880 (taller than wide). Render at its native
# aspect ratio first so we don't squish the logo horizontally.
MASTER_BOX=512 # final square canvas size
MASTER_W=$MASTER_BOX # render the longer side at full size
MASTER_H=$(( MASTER_BOX * 1246 / 1446 )) # preserve 1446:1246 aspect
MASTER_H=$MASTER_BOX # render the longer side at full size
MASTER_W=$(( MASTER_BOX * 720 / 880 )) # preserve 720:880 aspect
echo "Rendering ${MASTER_W}x${MASTER_H} from $SOURCE_SVG (preserving 1446:1246 aspect)..."
echo "Rendering ${MASTER_W}x${MASTER_H} from $SOURCE_SVG (preserving 720:880 aspect)..."
if [ "$SVG_RENDERER" = "inkscape" ]; then
inkscape --export-type=png --export-filename="$RAW_PNG" \
-w "$MASTER_W" -h "$MASTER_H" --export-background-opacity=0 \
+3 -69
View File
@@ -48,12 +48,11 @@ TMPDIR=$(mktemp -d)
LOGO_WHITE_SVG="$TMPDIR/logo_white.svg"
LOGO_WHITE="$TMPDIR/logo_white.png"
# Recolor the SVG fill to white before rasterizing. The phoenix logo.svg
# declares fill="#fcd414"; older sources used black/purple, kept for safety.
# Recolor the SVG fill to white before rasterizing. logo.svg declares the
# glyph with fill="black", so recolor both the attribute form and any hex.
sed -e 's/fill="black"/fill="#ffffff"/g' \
-e 's/#000000/#ffffff/g' \
-e 's/#7c52e0/#ffffff/g' \
-e 's/#fcd414/#ffffff/g' "$SOURCE_SVG" > "$LOGO_WHITE_SVG"
-e 's/#7c52e0/#ffffff/g' "$SOURCE_SVG" > "$LOGO_WHITE_SVG"
echo "Rendering white SVG (preserving aspect ratio)..."
@@ -67,19 +66,6 @@ else
rsvg-convert -h 1024 "$LOGO_WHITE_SVG" -o "$LOGO_WHITE"
fi
# Orange-fill render, for marks placed on a white/light background (iOS splash).
LOGO_ORANGE_SVG="$TMPDIR/logo_orange.svg"
LOGO_ORANGE="$TMPDIR/logo_orange.png"
sed -e 's/fill="black"/fill="'"$BG_COLOR"'"/g' \
-e 's/#000000/'"$BG_COLOR"'/g' \
-e 's/#7c52e0/'"$BG_COLOR"'/g' \
-e 's/#fcd414/'"$BG_COLOR"'/g' "$SOURCE_SVG" > "$LOGO_ORANGE_SVG"
if [ "$SVG_RENDERER" = "inkscape" ]; then
inkscape --export-type=png --export-filename="$LOGO_ORANGE" -h 1024 "$LOGO_ORANGE_SVG" 2>/dev/null
else
rsvg-convert -h 1024 "$LOGO_ORANGE_SVG" -o "$LOGO_ORANGE"
fi
# ── Adaptive icon foreground PNGs (transparent bg, white logo, safe-zone padding) ──
# Content at 47% of canvas to fit within Android's adaptive icon safe zone.
@@ -147,44 +133,12 @@ make_legacy_square 96 android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
make_legacy_square 144 android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
make_legacy_square 192 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
# Web logo.png (AppDownloadNudge) uses the same round brand-mark style.
make_legacy_round 512 public/logo.png
# PWA install icons (manifest.webmanifest "any" + "maskable" purposes).
make_legacy_round 192 public/icon-192.png
make_legacy_round 512 public/icon-512.png
make_legacy_round 48 android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
make_legacy_round 72 android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
make_legacy_round 96 android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
make_legacy_round 144 android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
make_legacy_round 192 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
# ── Android push-notification status-bar icon (ic_stat_ditto) ──
# Must be a flat white silhouette on transparent — the OS tints it, any
# color/gradient gets ignored or looks wrong. Referenced directly by
# NostrPoller.java / NotificationRelayService.java via R.drawable.ic_stat_ditto.
echo "Generating notification status-bar icon (ic_stat_ditto)..."
make_notification_icon() {
local size=$1
local content_size=$(echo "$size * 80 / 100" | bc)
local dest=$2
$MAGICK -size "${size}x${size}" "xc:none" \
\( "$LOGO_WHITE" -resize "${content_size}x${content_size}" \) \
-gravity center -compose over -composite \
"$dest"
}
for dir in drawable mipmap; do
make_notification_icon 24 android/app/src/main/res/${dir}-mdpi/ic_stat_ditto.png
make_notification_icon 48 android/app/src/main/res/${dir}-xhdpi/ic_stat_ditto.png
make_notification_icon 72 android/app/src/main/res/${dir}-xxhdpi/ic_stat_ditto.png
make_notification_icon 96 android/app/src/main/res/${dir}-xxxhdpi/ic_stat_ditto.png
done
make_notification_icon 36 android/app/src/main/res/drawable-hdpi/ic_stat_ditto.png
# Update background color
BACKGROUND_COLOR_FILE="android/app/src/main/res/values/ic_launcher_background.xml"
mkdir -p android/app/src/main/res/values
@@ -213,26 +167,6 @@ else
echo -e " ${YELLOW}Skipped: $IOS_ICON_DIR not found${NC}"
fi
# ── iOS launch screen (Splash.imageset, 2732x2732, white bg + small mark) ──
# Referenced by LaunchScreen.storyboard. Ships one image for all 3 scale
# slots (1x/2x/3x), matching how the project already had it set up.
echo "Generating iOS launch screen..."
IOS_SPLASH_DIR="ios/App/App/Assets.xcassets/Splash.imageset"
if [ -d "$IOS_SPLASH_DIR" ]; then
$MAGICK -size "2732x2732" "xc:white" \
\( "$LOGO_ORANGE" -resize "160x160" \) \
-gravity center -compose over -composite \
"$IOS_SPLASH_DIR/splash-2732x2732.png"
cp "$IOS_SPLASH_DIR/splash-2732x2732.png" "$IOS_SPLASH_DIR/splash-2732x2732-1.png"
cp "$IOS_SPLASH_DIR/splash-2732x2732.png" "$IOS_SPLASH_DIR/splash-2732x2732-2.png"
echo -e " ${GREEN}${NC} $IOS_SPLASH_DIR (3 files)"
else
echo -e " ${YELLOW}Skipped: $IOS_SPLASH_DIR not found${NC}"
fi
# Cleanup temp files
rm -rf "$TMPDIR"
-229
View File
@@ -1,229 +0,0 @@
#!/usr/bin/env node
/**
* migrate-posts.mjs — one-shot event migration between relays.
*
* Fetches all events authored by the configured pubkeys from the SOURCE relay
* and republishes the whitelisted kinds VERBATIM to the TARGET relay. Events
* keep their original signatures — no re-signing, no key material needed.
*
* Idempotent by nature: relays deduplicate by event id, so re-running the
* migration (or running it after a partial failure) is always safe.
*
* Default mode is a DRY RUN: connects to the source, fetches, prints a
* per-kind per-author count table (including out-of-scope kinds that will be
* skipped) and publishes nothing.
*
* Usage:
* node scripts/migrate-posts.mjs # dry run (read-only)
* node scripts/migrate-posts.mjs --execute # actually publish to target
*/
import { NRelay1 } from '@nostrify/nostrify';
import { nip19 } from 'nostr-tools';
// ─── Config ───────────────────────────────────────────────────────────────────
const SOURCE_RELAY = 'wss://nrelay.us-ea.st/';
const TARGET_RELAY = 'wss://relay.floonet.dev/';
/** Authors to migrate (npub form; decoded to hex below). */
const AUTHOR_NPUBS = [
'npub15gsytqvs5c78u83yv2agl4twjkk6qgem7gtwe2agu7s90tkelxys0xxely',
'npub12tuz8sva4r832xh2axwt0myf33ygpnc9huvzhxe8y6jkvq2f3l2s9ye4k7',
'npub1m049skfequeelxy032555eg7w47ff7qvzfc2cahym7xkrsgvmtqsnm9ny6',
];
/**
* Kinds to migrate. Anything else found on the source is reported but skipped
* — the target relay's write policy whitelist rejects unknown kinds anyway.
*/
const MIGRATE_KINDS = [0, 1, 3, 7, 10002, 30023];
/** Page size for source pagination (stay under typical relay limit caps). */
const PAGE_LIMIT = 500;
/** Per-query timeout (ms). */
const QUERY_TIMEOUT = 15_000;
// ─── Helpers ──────────────────────────────────────────────────────────────────
function npubToHex(npub) {
const decoded = nip19.decode(npub);
if (decoded.type !== 'npub') {
throw new Error(`Not an npub: ${npub}`);
}
return decoded.data;
}
function shortNpub(npub) {
return `${npub.slice(0, 12)}${npub.slice(-6)}`;
}
/**
* Fetch ALL events authored by `authors` from `relay`, paginating with
* `until`. No kinds filter — we want the full picture so out-of-scope kinds
* can be reported. Uses an inclusive `until` (the oldest seen timestamp) and
* dedupes by id, so same-second events at page boundaries are not dropped;
* the loop stops when a page yields no new ids.
*/
async function fetchAllByAuthors(relay, authors) {
const events = new Map(); // id -> event
let until = undefined;
for (;;) {
const filter = { authors, limit: PAGE_LIMIT };
if (until !== undefined) filter.until = until;
const page = await relay.query([filter], {
signal: AbortSignal.timeout(QUERY_TIMEOUT),
});
if (page.length === 0) break;
let newCount = 0;
let oldest = Infinity;
for (const evt of page) {
if (evt.created_at < oldest) oldest = evt.created_at;
if (!events.has(evt.id)) {
events.set(evt.id, evt);
newCount++;
}
}
process.stderr.write(
` fetched page: ${page.length} events (${newCount} new, total ${events.size})\n`,
);
if (newCount === 0) break; // page was entirely duplicates — done
until = oldest; // inclusive; dedupe handles the overlap
}
return [...events.values()];
}
/** Print a per-kind (rows) per-author (columns) count table. */
function printCountTable(events, authorsHex, npubs) {
const kinds = [...new Set(events.map((e) => e.kind))].sort((a, b) => a - b);
const colHeads = npubs.map(shortNpub);
const counts = new Map(); // `${kind}:${pubkey}` -> n
for (const evt of events) {
const key = `${evt.kind}:${evt.pubkey}`;
counts.set(key, (counts.get(key) ?? 0) + 1);
}
const kindCol = 8;
const scopeCol = 9;
const cols = colHeads.map((h) => h.length + 2);
const pad = (s, w) => String(s).padStart(w);
const header =
pad('kind', kindCol) +
pad('scope', scopeCol) +
colHeads.map((h, i) => pad(h, cols[i])).join('') +
pad('total', 8);
console.log(header);
console.log('-'.repeat(header.length));
let grandTotal = 0;
let migrateTotal = 0;
for (const kind of kinds) {
const inScope = MIGRATE_KINDS.includes(kind);
let rowTotal = 0;
const cells = authorsHex.map((pk, i) => {
const n = counts.get(`${kind}:${pk}`) ?? 0;
rowTotal += n;
return pad(n, cols[i]);
});
grandTotal += rowTotal;
if (inScope) migrateTotal += rowTotal;
console.log(
pad(kind, kindCol) +
pad(inScope ? 'migrate' : 'SKIP', scopeCol) +
cells.join('') +
pad(rowTotal, 8),
);
}
console.log('-'.repeat(header.length));
console.log(
pad('all', kindCol) +
pad('', scopeCol) +
authorsHex
.map((pk, i) =>
pad(events.filter((e) => e.pubkey === pk).length, cols[i]),
)
.join('') +
pad(grandTotal, 8),
);
console.log(
`\nTotal on source: ${grandTotal} | to migrate: ${migrateTotal} | skipped (out-of-scope kinds): ${grandTotal - migrateTotal}`,
);
}
// ─── Main ─────────────────────────────────────────────────────────────────────
async function main() {
const execute = process.argv.includes('--execute');
const authorsHex = AUTHOR_NPUBS.map(npubToHex);
console.log(`Source relay: ${SOURCE_RELAY}`);
console.log(`Target relay: ${TARGET_RELAY}`);
console.log(`Mode: ${execute ? 'EXECUTE (publishing to target)' : 'dry run (read-only)'}`);
console.log(`Kinds: ${MIGRATE_KINDS.join(', ')}`);
console.log('Authors:');
for (const npub of AUTHOR_NPUBS) console.log(` ${npub}`);
console.log('');
const source = new NRelay1(SOURCE_RELAY);
console.log('Fetching all events by the configured authors from the source…');
const all = await fetchAllByAuthors(source, authorsHex);
console.log('');
printCountTable(all, authorsHex, AUTHOR_NPUBS);
const toMigrate = all
.filter((e) => MIGRATE_KINDS.includes(e.kind))
// Oldest first: replaceable kinds (0, 3, 10002, 30023) land in
// chronological order so the newest version wins on the target.
.sort((a, b) => a.created_at - b.created_at);
if (!execute) {
console.log('\nDry run — nothing published. Re-run with --execute to migrate.');
await source.close();
return;
}
console.log(`\nPublishing ${toMigrate.length} events to ${TARGET_RELAY}\n`);
const target = new NRelay1(TARGET_RELAY);
let ok = 0;
let blocked = 0;
for (const evt of toMigrate) {
const label = `kind ${String(evt.kind).padStart(5)} ${evt.id.slice(0, 12)}… (${new Date(evt.created_at * 1000).toISOString()})`;
try {
// Republish verbatim — original id + signature remain valid.
await target.event(evt, { signal: AbortSignal.timeout(QUERY_TIMEOUT) });
ok++;
console.log(`OK ${label}`);
} catch (err) {
// The target has a write policy; blocked/rejected responses MUST be
// visible, never swallowed.
blocked++;
const reason = err instanceof Error ? err.message : String(err);
console.log(`BLOCKED ${label}${reason}`);
}
}
console.log(`\nSummary: ${ok} accepted, ${blocked} blocked/rejected, of ${toMigrate.length} attempted.`);
if (blocked > 0) process.exitCode = 1;
await source.close();
await target.close();
}
main().catch((err) => {
console.error('Migration failed:', err);
process.exit(1);
});
+21 -40
View File
@@ -15,11 +15,9 @@ import { SentryProvider } from "@/components/SentryProvider";
import { TooltipProvider } from "@/components/ui/tooltip";
import { useAppContext } from "@/hooks/useAppContext";
import { useNsecPasteGuard } from "@/hooks/useNsecPasteGuard";
import { useTor } from "@/hooks/useTor";
import type { AppConfig } from "@/contexts/AppContext";
import { AudioPlayerProvider } from "@/contexts/AudioPlayerContext";
import { NWCProvider } from "@/contexts/NWCContext";
import { OnboardingProvider } from "@/contexts/OnboardingProvider";
import { BuildConfigSchema, type BuildConfig } from "@/lib/schemas";
import { secureStorage } from "@/lib/secureStorage";
@@ -41,8 +39,8 @@ const queryClient = new QueryClient({
/** Hardcoded fallback values. Always provides every required field. */
const hardcodedConfig: AppConfig = {
appName: "Eranos",
appId: "eranos",
appName: "Agora",
appId: "agora",
shareOrigin: import.meta.env.VITE_SHARE_ORIGIN || undefined,
homePage: "campaigns",
client: "naddr1qvzqqqru7cpzq7q6z5ns2hm5c8msyv83qwzxpxe52j8c4d4q5m92wsp9sflelkh9qqzkzem0wfssdl264k",
@@ -59,6 +57,7 @@ const hardcodedConfig: AppConfig = {
feedIncludeReposts: true,
feedIncludeGenericReposts: true,
feedIncludeReactions: false,
feedIncludeZaps: true,
feedIncludeArticles: true,
showArticles: true,
showHighlights: true,
@@ -118,6 +117,7 @@ const hardcodedConfig: AppConfig = {
"feed",
"communities",
"world",
"wallet",
"agent",
"messages",
"profile",
@@ -145,8 +145,14 @@ const hardcodedConfig: AppConfig = {
imageQuality: 'compressed',
imageProxy: 'https://wsrv.nl',
lowBandwidthMode: false,
torEnabled: false,
curatorPubkey: '932614571afcbad4d17a191ee281e39eebbb41b93fac8fd87829622aeb112f4d',
esploraApis: [
'https://mempool.emzy.de/api',
'https://mempool.space/api',
'https://blockstream.info/api',
],
blockbookBaseUrl: 'https://btc.trezor.io',
bip352IndexerUrl: 'https://silentpayments.dev/blindbit/mainnet',
sidebarWidgets: [
{ id: 'trends' },
{ id: 'hot-posts' },
@@ -157,13 +163,6 @@ const hardcodedConfig: AppConfig = {
aiModel: 'google/gemma-4-26b',
aiSystemPrompt: '',
translateWorkerUrl: import.meta.env.VITE_TRANSLATE_WORKER_URL || '',
// Grin payments (Plan 2, C1). The GoblinPay instance URL/token are
// deployment-specific and land via build config (APP_CONFIG) or env;
// empty disables the in-app GoblinPay path. The node is read-only
// (kernel lookups for the payment-proof tally).
goblinPayUrl: import.meta.env.VITE_GOBLINPAY_URL || '',
goblinPayApiToken: import.meta.env.VITE_GOBLINPAY_API_TOKEN || '',
grinNodeUrl: import.meta.env.VITE_GRIN_NODE_URL || 'https://api.grin.money',
};
/**
@@ -193,24 +192,6 @@ const defaultConfig: AppConfig = {
feedSettings: { ...hardcodedConfig.feedSettings, ...buildConfig.feedSettings },
};
/**
* Wraps NostrProvider with a key that changes when Tor routing changes, so the
* relay layer remounts: existing connections close and reopen under the new
* routing (direct ⇄ fail-closed Tor), and reconnect immediately once Tor is up
* rather than waiting out the relay reconnect backoff. No-op off Android (the
* key is always "direct").
*/
function RelayProvider({ children }: { children: React.ReactNode }) {
const { config } = useAppContext();
const { status } = useTor();
const key = !config.torEnabled
? "direct"
: status === "connected"
? "tor-connected"
: "tor-pending";
return <NostrProvider key={key}>{children}</NostrProvider>;
}
export function App() {
useNsecPasteGuard();
@@ -222,19 +203,19 @@ export function App() {
<PlausibleProvider>
<QueryClientProvider client={queryClient}>
<NostrLoginProvider storageKey="nostr:login" storage={secureStorage}>
<RelayProvider>
<NostrProvider>
<NostrSync />
<InitialSyncRunner />
<NativeNotifications />
<OnboardingProvider>
<TooltipProvider>
<AudioPlayerProvider>
<AppRouter />
</AudioPlayerProvider>
</TooltipProvider>
</OnboardingProvider>
</RelayProvider>
<NWCProvider>
<OnboardingProvider>
<TooltipProvider>
<AppRouter />
</TooltipProvider>
</OnboardingProvider>
</NWCProvider>
</NostrProvider>
</NostrLoginProvider>
</QueryClientProvider>
</PlausibleProvider>
+32 -42
View File
@@ -7,14 +7,10 @@ import { TopNav } from "./components/TopNav";
import { OnboardingGate } from "./components/OnboardingGate";
import { ScrollToTop } from "./components/ScrollToTop";
import { VersionCheck } from "./components/VersionCheck";
import { MinimizedAudioBar } from "./components/MinimizedAudioBar";
import { AudioNavigationGuard } from "./components/AudioNavigationGuard";
import { TorStatusBanner } from "./components/TorStatusBanner";
import { useCurrentUser } from "./hooks/useCurrentUser";
import { useProfileUrl } from "./hooks/useProfileUrl";
import { cn } from "@/lib/utils";
import { openUrl } from "@/lib/downloadFile";
import { TEAM_URL } from "@/lib/agoraDefaults";
// Critical-path pages: eagerly loaded (landing + fallback)
import Index from "./pages/Index";
@@ -40,24 +36,27 @@ const CSAEPolicyPage = lazy(() => import("./pages/CSAEPolicyPage").then(m => ({
const ExternalContentPage = lazy(() => import("./pages/ExternalContentPage").then(m => ({ default: m.ExternalContentPage })));
const GeotagPage = lazy(() => import("./pages/GeotagPage").then(m => ({ default: m.GeotagPage })));
const HashtagPage = lazy(() => import("./pages/HashtagPage").then(m => ({ default: m.HashtagPage })));
const MessagesPage = lazy(() => import("./pages/MessagesPage").then(m => ({ default: m.MessagesPage })));
const MyDashboardPage = lazy(() => import("./pages/MyDashboardPage").then(m => ({ default: m.MyDashboardPage })));
const AboutPage = lazy(() => import("./pages/AboutPage").then(m => ({ default: m.AboutPage })));
const DonorGuidePage = lazy(() => import("./pages/DonorGuidePage").then(m => ({ default: m.DonorGuidePage })));
const RecipientGuidePage = lazy(() => import("./pages/RecipientGuidePage").then(m => ({ default: m.RecipientGuidePage })));
const CorporateSponsorshipPage = lazy(() => import("./pages/CorporateSponsorshipPage").then(m => ({ default: m.CorporateSponsorshipPage })));
const ActivistGuidePage = lazy(() => import("./pages/ActivistGuidePage").then(m => ({ default: m.ActivistGuidePage })));
const LanguageSettingsPage = lazy(() => import("./pages/LanguageSettingsPage").then(m => ({ default: m.LanguageSettingsPage })));
const NetworkSettingsPage = lazy(() => import("./pages/NetworkSettingsPage").then(m => ({ default: m.NetworkSettingsPage })));
const NIP19Page = lazy(() => import("./pages/NIP19Page").then(m => ({ default: m.NIP19Page })));
const NotificationSettings = lazy(() => import("./pages/NotificationSettings").then(m => ({ default: m.NotificationSettings })));
const NotificationsPage = lazy(() => import("./pages/NotificationsPage").then(m => ({ default: m.NotificationsPage })));
const OrganizationsPage = lazy(() => import("./pages/OrganizationsPage").then(m => ({ default: m.OrganizationsPage })));
const OrganizersPage = lazy(() => import("./pages/OrganizersPage").then(m => ({ default: m.OrganizersPage })));
const EventDashboardPage = lazy(() => import("./pages/EventDashboardPage").then(m => ({ default: m.EventDashboardPage })));
const PrivacyPolicyPage = lazy(() => import("./pages/PrivacyPolicyPage").then(m => ({ default: m.PrivacyPolicyPage })));
const ProfileSettings = lazy(() => import("./pages/ProfileSettings").then(m => ({ default: m.ProfileSettings })));
const SearchPage = lazy(() => import("./pages/SearchPage").then(m => ({ default: m.SearchPage })));
const SettingsPage = lazy(() => import("./pages/SettingsPage").then(m => ({ default: m.SettingsPage })));
const WalletPage = lazy(() => import("./pages/WalletPage").then(m => ({ default: m.WalletPage })));
const WalletMigrateV1Page = lazy(() => import("./pages/WalletMigrateV1Page").then(m => ({ default: m.WalletMigrateV1Page })));
const WalletDoubleTweakFixPage = lazy(() => import("./pages/WalletDoubleTweakFixPage").then(m => ({ default: m.WalletDoubleTweakFixPage })));
const WalletRecoveryPage = lazy(() => import("./pages/WalletRecoveryPage").then(m => ({ default: m.WalletRecoveryPage })));
const WalletSettingsPage = lazy(() => import("./pages/WalletSettingsPage").then(m => ({ default: m.WalletSettingsPage })));
const LegacyWalletRecoveryPage = lazy(() => import("./pages/LegacyWalletRecoveryPage").then(m => ({ default: m.LegacyWalletRecoveryPage })));
const RemoteLoginSuccessPage = lazy(() => import("./pages/RemoteLoginSuccessPage").then(m => ({ default: m.RemoteLoginSuccessPage })));
/** Redirects /profile to the user's canonical profile URL (nip05 or npub). */
@@ -89,15 +88,13 @@ function SiteFooter() {
<div className="mx-auto max-w-7xl px-4 sm:px-6 py-8 flex flex-col sm:flex-row items-center justify-between gap-4 text-xs text-muted-foreground">
<button
type="button"
onClick={() => void openUrl(TEAM_URL)}
onClick={() => void openUrl("https://gitlab.com/soapbox-pub/agora")}
className="hover:text-foreground motion-safe:transition-colors"
>
{t('nav.sourceCode')}
</button>
<nav className="flex items-center gap-5">
<Link to="/about" className="hover:text-foreground motion-safe:transition-colors">{t('nav.about')}</Link>
<Link to="/sponsors" className="hover:text-foreground motion-safe:transition-colors">{t('nav.sponsors')}</Link>
<Link to="/verify" className="hover:text-foreground motion-safe:transition-colors">{t('nav.verify')}</Link>
<Link to="/privacy" className="hover:text-foreground motion-safe:transition-colors">{t('nav.privacy')}</Link>
<Link to="/safety" className="hover:text-foreground motion-safe:transition-colors">{t('nav.safety')}</Link>
<Link to="/changelog" className="hover:text-foreground motion-safe:transition-colors">{t('nav.changelog')}</Link>
@@ -114,18 +111,18 @@ function SiteFooter() {
* form/prose-style pages, wide (full width) for landing / dashboard / detail
* pages that render their own internal layout.
*/
function FundraiserLayout({ narrow, hideFooter }: { narrow: boolean; hideFooter?: boolean }) {
function FundraiserLayout({ narrow }: { narrow: boolean }) {
return (
<div className={cn('flex flex-col bg-background', hideFooter ? 'h-dvh overflow-hidden' : 'min-h-dvh')}>
<div className="min-h-dvh flex flex-col bg-background">
<TopNav />
<Suspense fallback={<PageSkeleton />}>
<div
className={cn('min-w-0 w-full flex-1 mx-auto', hideFooter && 'min-h-0', narrow && 'max-w-3xl')}
className={cn("flex-1 min-w-0 w-full mx-auto", narrow && "max-w-3xl")}
>
<Outlet />
</div>
</Suspense>
{!hideFooter && <SiteFooter />}
<SiteFooter />
</div>
);
}
@@ -136,11 +133,6 @@ export function AppRouter() {
<Toaster />
<VersionCheck />
<ScrollToTop />
<AudioNavigationGuard />
<MinimizedAudioBar />
{/* App-wide Tor status banner. Must live inside BrowserRouter — it
renders a <Link> to the Tor settings, which needs Router context. */}
<TorStatusBanner />
<OnboardingGate>
<Routes>
{/* Narrow layout — `max-w-3xl` center column. The default for
@@ -157,31 +149,40 @@ export function AppRouter() {
<Route path="/settings/appearance" element={<AppearanceSettingsPage />} />
<Route path="/settings/language" element={<LanguageSettingsPage />} />
<Route path="/settings/profile" element={<ProfileSettings />} />
<Route path="/settings/wallet" element={<WalletSettingsPage />} />
<Route path="/settings/notifications" element={<NotificationSettings />} />
<Route path="/settings/advanced" element={<AdvancedSettingsPage />} />
<Route path="/settings/network" element={<NetworkSettingsPage />} />
<Route path="/wallet" element={<WalletPage />} />
<Route path="/wallet/legacy" element={<LegacyWalletRecoveryPage />} />
{/* Old nested paths kept as redirects so any existing links / muscle
memory still land on the right page. `/wallet/settings` was an
intermediate hub that has been replaced by an overflow menu on
`/wallet`, so it redirects to the wallet home. `/wallet/backup`
is now an in-page dialog opened from that menu, so it also
redirects home. */}
<Route path="/wallet/settings" element={<Navigate to="/wallet" replace />} />
<Route path="/wallet/backup" element={<Navigate to="/wallet" replace />} />
<Route path="/wallet/settings/backup" element={<Navigate to="/wallet" replace />} />
<Route path="/wallet/settings/legacy" element={<Navigate to="/wallet/legacy" replace />} />
<Route path="/wallet/recovery" element={<WalletRecoveryPage />} />
<Route path="/wallet/migrate-v1" element={<WalletMigrateV1Page />} />
<Route path="/wallet/double-tweak-fix" element={<WalletDoubleTweakFixPage />} />
<Route path="/bitcoin" element={<Navigate to="/wallet" replace />} />
{/* Legacy /help routes redirect to /about so existing links keep
working. The About page and the two guides themselves live
under the wide layout below. */}
<Route path="/help" element={<Navigate to="/about" replace />} />
<Route path="/help/donors" element={<Navigate to="/about/donors" replace />} />
<Route path="/help/activists" element={<Navigate to="/about/recipients" replace />} />
<Route path="/help/recipients" element={<Navigate to="/about/recipients" replace />} />
<Route path="/help/activists" element={<Navigate to="/about/activists" replace />} />
<Route path="/privacy" element={<PrivacyPolicyPage />} />
<Route path="/safety" element={<CSAEPolicyPage />} />
<Route path="/changelog" element={<ChangelogPage />} />
<Route path="/organizers" element={<OrganizersPage />} />
{/* `/settings/verifier` moved to the public `/verify` onboarding
page. Keep the old path as a redirect so existing links resolve. */}
<Route path="/settings/verifier" element={<Navigate to="/verify" replace />} />
{/* Callback target for remote signers (e.g. Amber, Primal) after NIP-46 approval */}
<Route path="/remoteloginsuccess" element={<RemoteLoginSuccessPage />} />
</Route>
<Route element={<FundraiserLayout narrow={false} hideFooter />}>
<Route path="/messages" element={<MessagesPage />} />
</Route>
{/* Wide layout — no max-width on the center column. Used by landing /
list / detail pages that render their own internal width
constraints. */}
@@ -201,22 +202,11 @@ export function AppRouter() {
<Route path="/pledges/new" element={<CreateActionPage />} />
<Route path="/dashboard" element={<EventDashboardPage />} />
<Route path="/i/*" element={<ExternalContentPage />} />
{/* About page + Donor / Recipient guides. Full-bleed landing-style
{/* About page + Donor / Activist guides. Full-bleed landing-style
layouts that render their own internal max-widths. */}
<Route path="/about" element={<AboutPage />} />
<Route path="/about/donors" element={<DonorGuidePage />} />
<Route path="/about/recipients" element={<RecipientGuidePage />} />
{/* Corporate sponsorship / partnership marketing page. Wide layout
so the hero and section backgrounds span the viewport like /about. */}
<Route path="/sponsors" element={<CorporateSponsorshipPage />} />
{/* Verification onboarding / marketing page. Wide layout so the
hero and section backgrounds can span the viewport like /about. */}
<Route path="/verify" element={<OrganizationsPage />} />
<Route path="/organizations" element={<Navigate to="/verify" replace />} />
{/* Legacy URL: the recipient guide lived at `/about/activists`
before the "activist" → "recipient" copy change. Redirect so
external links and bookmarks still resolve. */}
<Route path="/about/activists" element={<Navigate to="/about/recipients" replace />} />
<Route path="/about/activists" element={<ActivistGuidePage />} />
{/* NIP-19 route for npub1, note1, naddr1, nevent1, nprofile1.
Goes through the wide layout because the dispatch may resolve to
a profile, campaign, action, or community page — all of which
+5 -2
View File
@@ -5,10 +5,11 @@ import type { NostrEvent } from '@nostrify/nostrify';
import { Camera, Clock, DollarSign, Info, Megaphone, Palette } from 'lucide-react';
import { parseAction, type Action } from '@/hooks/useActions';
import { useBtcPrice } from '@/hooks/useBtcPrice';
import { countryCodeToFlag, getGeoDisplayName } from '@/lib/countries';
import { CountryFlag } from '@/components/CountryFlag';
import { DEFAULT_COVER_IMAGE } from '@/lib/defaultActionCovers';
import { formatPledgeAmount } from '@/lib/pledges';
import { formatSats, satsToUSDWhole } from '@/lib/bitcoin';
import { cn } from '@/lib/utils';
const ACTION_ICONS = {
@@ -27,6 +28,7 @@ function actionNaddr(action: Action): string {
}
export function ActionContent({ event, compact = true }: { event: NostrEvent; compact?: boolean }) {
const { data: btcPrice } = useBtcPrice();
const action = parseAction(event);
if (!action) return null;
@@ -96,8 +98,9 @@ export function ActionContent({ event, compact = true }: { event: NostrEvent; co
<div className="flex items-center gap-2 text-sm">
<DollarSign className="size-4 shrink-0 text-primary" />
<span className="font-semibold">
{formatPledgeAmount(action.bounty)}
{btcPrice ? satsToUSDWhole(action.bounty, btcPrice) : `${formatSats(action.bounty)} sats`}
</span>
{btcPrice && <span className="text-xs text-muted-foreground">~{formatSats(action.bounty)} sats</span>}
{action.countryCode && (
<>
<span className="text-muted-foreground/50">·</span>
+228
View File
@@ -20,6 +20,26 @@ const DEFAULT_AI_MODEL = 'google/gemma-4-26b';
/** Build-time default translation worker URL from the environment variable. */
const DEFAULT_TRANSLATE_WORKER_URL = import.meta.env.VITE_TRANSLATE_WORKER_URL || '';
/** Hardcoded defaults for the Bitcoin backend fields. Used for reset buttons. */
const DEFAULT_ESPLORA_APIS = [
'https://mempool.emzy.de/api',
'https://mempool.space/api',
'https://blockstream.info/api',
];
const DEFAULT_BLOCKBOOK_BASE_URL = 'https://btc.trezor.io';
const DEFAULT_BIP352_INDEXER_URL = 'https://silentpayments.dev/blindbit/mainnet';
/** Validate an http(s) URL with no trailing slash. */
function isValidEndpoint(url: string): boolean {
if (!/^https?:\/\//i.test(url)) return false;
try {
new URL(url);
return true;
} catch {
return false;
}
}
/** The build-time default DSN from the environment variable. */
const DEFAULT_SENTRY_DSN = import.meta.env.VITE_SENTRY_DSN || '';
@@ -31,6 +51,7 @@ export function AdvancedSettings() {
const [systemOpen, setSystemOpen] = useState(true);
const [aiOpen, setAiOpen] = useState(false);
const [sentryOpen, setSentryOpen] = useState(false);
const [bitcoinOpen, setBitcoinOpen] = useState(false);
const [dangerOpen, setDangerOpen] = useState(false);
const [vanishDialogOpen, setVanishDialogOpen] = useState(false);
const [statsPubkey, setStatsPubkey] = useState(config.nip85StatsPubkey);
@@ -45,6 +66,15 @@ export function AdvancedSettings() {
const [showApiKey, setShowApiKey] = useState(false);
const [systemPromptDraft, setSystemPromptDraft] = useState(config.aiSystemPrompt || DEFAULT_SYSTEM_PROMPT_TEMPLATE);
// Bitcoin backend drafts. `esploraApis` is an ordered array edited as one URL per line.
const [esploraApisDraft, setEsploraApisDraft] = useState(config.esploraApis.join('\n'));
const [blockbookDraft, setBlockbookDraft] = useState(config.blockbookBaseUrl);
const [bip352Draft, setBip352Draft] = useState(config.bip352IndexerUrl);
useEffect(() => { setEsploraApisDraft(config.esploraApis.join('\n')); }, [config.esploraApis]);
useEffect(() => { setBlockbookDraft(config.blockbookBaseUrl); }, [config.blockbookBaseUrl]);
useEffect(() => { setBip352Draft(config.bip352IndexerUrl); }, [config.bip352IndexerUrl]);
useEffect(() => { setBaseUrlDraft(config.aiBaseURL); }, [config.aiBaseURL]);
useEffect(() => { setApiKeyDraft(config.aiApiKey); }, [config.aiApiKey]);
useEffect(() => { setModelDraft(config.aiModel); }, [config.aiModel]);
@@ -118,6 +148,67 @@ export function AdvancedSettings() {
}
};
const commitEsploraApis = () => {
const urls = esploraApisDraft
.split('\n')
.map((line) => line.trim().replace(/\/+$/, ''))
.filter(Boolean);
if (urls.length === 0) {
setEsploraApisDraft(DEFAULT_ESPLORA_APIS.join('\n'));
updateConfig((current) => ({ ...current, esploraApis: DEFAULT_ESPLORA_APIS }));
toast({ title: 'Esplora endpoints reset to defaults' });
return;
}
const invalid = urls.find((url) => !isValidEndpoint(url));
if (invalid) {
toast({ title: 'Invalid Esplora endpoint', description: invalid, variant: 'destructive' });
return;
}
const changed =
urls.length !== config.esploraApis.length ||
urls.some((url, i) => url !== config.esploraApis[i]);
if (changed) {
updateConfig((current) => ({ ...current, esploraApis: urls }));
toast({ title: 'Esplora endpoints updated' });
}
// Normalize the textarea to the cleaned list.
setEsploraApisDraft(urls.join('\n'));
};
const commitBlockbook = () => {
const trimmed = blockbookDraft.trim().replace(/\/+$/, '');
if (!trimmed) {
setBlockbookDraft(DEFAULT_BLOCKBOOK_BASE_URL);
if (config.blockbookBaseUrl !== DEFAULT_BLOCKBOOK_BASE_URL) {
updateConfig((current) => ({ ...current, blockbookBaseUrl: DEFAULT_BLOCKBOOK_BASE_URL }));
toast({ title: 'Blockbook URL reset to default' });
}
return;
}
if (!isValidEndpoint(trimmed)) {
toast({ title: 'Invalid Blockbook URL', variant: 'destructive' });
return;
}
if (trimmed !== config.blockbookBaseUrl) {
updateConfig((current) => ({ ...current, blockbookBaseUrl: trimmed }));
toast({ title: 'Blockbook URL updated' });
}
setBlockbookDraft(trimmed);
};
const commitBip352 = () => {
const trimmed = bip352Draft.trim().replace(/\/+$/, '');
if (trimmed && !isValidEndpoint(trimmed)) {
toast({ title: 'Invalid indexer URL', variant: 'destructive' });
return;
}
if (trimmed !== config.bip352IndexerUrl) {
updateConfig((current) => ({ ...current, bip352IndexerUrl: trimmed }));
toast({ title: trimmed ? 'Silent-payment indexer updated' : 'Silent-payment scanning disabled' });
}
setBip352Draft(trimmed);
};
return (
<div>
{/* Agent Section */}
@@ -442,6 +533,143 @@ export function AdvancedSettings() {
</Collapsible>
</div>
{/* Bitcoin Section */}
<div>
<Collapsible open={bitcoinOpen} onOpenChange={setBitcoinOpen}>
<CollapsibleTrigger asChild>
<Button
variant="ghost"
className="relative w-full justify-between px-3 py-3.5 h-auto hover:bg-muted/20 hover:text-foreground rounded-none"
>
<span className="text-base font-semibold">Bitcoin</span>
{bitcoinOpen ? (
<ChevronUp className="h-4 w-4 text-muted-foreground" />
) : (
<ChevronDown className="h-4 w-4 text-muted-foreground" />
)}
<div className="absolute bottom-0 left-0 right-0 h-1 bg-primary rounded-full" />
</Button>
</CollapsibleTrigger>
<CollapsibleContent>
<div className="px-3 pt-3 pb-4 space-y-5">
{/* Esplora API endpoints */}
<div>
<div className="flex items-center justify-between mb-1">
<Label htmlFor="esplora-apis" className="text-sm font-medium">
Esplora API endpoints
</Label>
{esploraApisDraft.trim() !== DEFAULT_ESPLORA_APIS.join('\n') && (
<Button
variant="ghost"
size="sm"
className="h-6 w-6 p-0"
title="Restore to defaults"
onClick={() => {
setEsploraApisDraft(DEFAULT_ESPLORA_APIS.join('\n'));
updateConfig((current) => ({ ...current, esploraApis: DEFAULT_ESPLORA_APIS }));
toast({ title: 'Esplora endpoints reset to defaults' });
}}
>
<RotateCcw className="h-3.5 w-3.5" />
</Button>
)}
</div>
<p className="text-xs text-muted-foreground mt-1 mb-2">
Esplora-compatible REST roots used for on-chain zaps, donations, and Bitcoin address/tx pages. One URL per line, no trailing slash. Tried in order with failover when an endpoint is rate-limited or down.
</p>
<Textarea
id="esplora-apis"
value={esploraApisDraft}
onChange={(e) => setEsploraApisDraft(e.target.value)}
onBlur={commitEsploraApis}
placeholder={DEFAULT_ESPLORA_APIS.join('\n')}
className="min-h-[88px] max-h-[200px] resize-y font-mono text-base md:text-sm"
autoComplete="off"
spellCheck={false}
/>
</div>
{/* Blockbook base URL */}
<div>
<div className="flex items-center justify-between mb-1">
<Label htmlFor="blockbook-url" className="text-sm font-medium">
Blockbook API URL
</Label>
{blockbookDraft.trim() !== DEFAULT_BLOCKBOOK_BASE_URL && (
<Button
variant="ghost"
size="sm"
className="h-6 w-6 p-0"
title="Restore to default"
onClick={() => {
setBlockbookDraft(DEFAULT_BLOCKBOOK_BASE_URL);
updateConfig((current) => ({ ...current, blockbookBaseUrl: DEFAULT_BLOCKBOOK_BASE_URL }));
toast({ title: 'Blockbook URL reset to default' });
}}
>
<RotateCcw className="h-3.5 w-3.5" />
</Button>
)}
</div>
<p className="text-xs text-muted-foreground mt-1 mb-2">
Trezor Blockbook instance used by the HD wallet to scan balances and history. <span className="font-medium text-foreground/80">Privacy note:</span> the wallet's full xpub is sent to this server. Self-host for maximum privacy.
</p>
<Input
id="blockbook-url"
type="url"
value={blockbookDraft}
onChange={(e) => setBlockbookDraft(e.target.value)}
onBlur={commitBlockbook}
placeholder={DEFAULT_BLOCKBOOK_BASE_URL}
className="font-mono text-base md:text-sm"
autoComplete="off"
spellCheck={false}
/>
</div>
{/* BIP-352 silent payment indexer */}
<div>
<div className="flex items-center justify-between mb-1">
<Label htmlFor="bip352-url" className="text-sm font-medium">
Silent payment indexer
</Label>
{bip352Draft.trim() !== DEFAULT_BIP352_INDEXER_URL && (
<Button
variant="ghost"
size="sm"
className="h-6 w-6 p-0"
title="Restore to default"
onClick={() => {
setBip352Draft(DEFAULT_BIP352_INDEXER_URL);
updateConfig((current) => ({ ...current, bip352IndexerUrl: DEFAULT_BIP352_INDEXER_URL }));
toast({ title: 'Silent-payment indexer reset to default' });
}}
>
<RotateCcw className="h-3.5 w-3.5" />
</Button>
)}
</div>
<p className="text-xs text-muted-foreground mt-1 mb-2">
BIP-352 tweak-data indexer (BlindBit Oracle) used to detect incoming silent payments (<code className="bg-muted px-1 rounded">sp1…</code>). Your scan key never leaves the device. Leave empty to disable silent-payment scanning.
</p>
<Input
id="bip352-url"
type="url"
value={bip352Draft}
onChange={(e) => setBip352Draft(e.target.value)}
onBlur={commitBip352}
placeholder={DEFAULT_BIP352_INDEXER_URL}
className="font-mono text-base md:text-sm"
autoComplete="off"
spellCheck={false}
/>
</div>
</div>
</CollapsibleContent>
</Collapsible>
</div>
{/* Error Reporting Section */}
<div>
<Collapsible open={sentryOpen} onOpenChange={setSentryOpen}>
+47 -17
View File
@@ -1,16 +1,20 @@
import type { NostrEvent } from '@nostrify/nostrify';
import type { ReactNode } from 'react';
import { CalendarClock, HandHeart, MapPin, Megaphone, Users } from 'lucide-react';
import { useRef } from 'react';
import { CalendarClock, HandHeart, MapPin, Megaphone, ShieldCheck, Users } from 'lucide-react';
import { nip19 } from 'nostr-tools';
import { Link } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import { useBtcPrice } from '@/hooks/useBtcPrice';
import { useCampaignDonations } from '@/hooks/useCampaignDonations';
import { useAuthor } from '@/hooks/useAuthor';
import { useInView } from '@/hooks/useInView';
import { parseAction } from '@/hooks/useActions';
import { getGeoDisplayName } from '@/lib/countries';
import { parseCampaign, getCampaignCountryLabel } from '@/lib/campaign';
import { parseCommunityEvent } from '@/lib/communityUtils';
import { formatUsdGoal } from '@/lib/formatCampaignAmount';
import { formatCampaignAmount, formatUsdGoal, satsToUsd } from '@/lib/formatCampaignAmount';
import { formatCompactPledgeDeadline, formatPledgeAmount } from '@/lib/pledges';
import { sanitizeUrl } from '@/lib/sanitizeUrl';
import { cn } from '@/lib/utils';
@@ -51,8 +55,14 @@ function InlineShell({
}
export function CampaignInlinePreview({ event }: { event: NostrEvent }) {
const { t } = useTranslation();
const campaign = parseCampaign(event);
const { data: btcPrice } = useBtcPrice();
// Defer the Esplora-backed donation lookup until the preview scrolls into
// view — feeds can render many of these, and fetching all of them eagerly
// contributed to the Esplora rate-limiting storm.
const previewRef = useRef<HTMLAnchorElement>(null);
const inView = useInView(previewRef);
const { data: stats } = useCampaignDonations(campaign ?? undefined, { enabled: inView });
const author = useAuthor(event.pubkey);
if (!campaign) return null;
@@ -62,27 +72,46 @@ export function CampaignInlinePreview({ event }: { event: NostrEvent }) {
?? sanitizeUrl(authorMetadata?.picture);
const naddr = nip19.naddrEncode({ kind: event.kind, pubkey: event.pubkey, identifier: campaign.identifier });
const countryLabel = getCampaignCountryLabel(campaign);
const goalLabel = campaign.goalUsd && campaign.goalUsd > 0
? t('campaignsDetail.target', { amount: formatUsdGoal(campaign.goalUsd) })
: undefined;
const isSilentPayment = !campaign.wallets.onchain;
const goalLabel = campaign.goalUsd && campaign.goalUsd > 0 ? formatUsdGoal(campaign.goalUsd) : undefined;
const raisedSats = stats?.totalSats ?? 0;
const raisedLabel = isSilentPayment ? undefined : formatCampaignAmount(raisedSats, btcPrice);
const raisedUsd = isSilentPayment ? undefined : satsToUsd(raisedSats, btcPrice);
const progress = campaign.goalUsd && raisedUsd !== undefined
? Math.min(100, Math.round((raisedUsd / campaign.goalUsd) * 100))
: 0;
return (
<Link to={`/${naddr}`} onClick={(e) => e.stopPropagation()} className="block rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 focus-visible:ring-offset-background">
<Link ref={previewRef} to={`/${naddr}`} onClick={(e) => e.stopPropagation()} className="block rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 focus-visible:ring-offset-background">
<InlineShell
image={cover}
fallbackIcon={<HandHeart className="size-12" />}
title={campaign.title}
description={campaign.story}
meta={(
<div className="flex flex-wrap items-center gap-x-4 gap-y-1.5 pt-1 text-xs text-muted-foreground">
{goalLabel && (
<span className="font-semibold text-foreground">{goalLabel}</span>
)}
{countryLabel && (
<span className="inline-flex items-center gap-1.5">
{countryLabel}
</span>
)}
<div className="space-y-2 pt-1">
{campaign.goalUsd && !isSilentPayment ? (
<div className="h-1.5 overflow-hidden rounded-full bg-foreground/15">
<div className="h-full rounded-full bg-primary" style={{ width: `${progress}%` }} />
</div>
) : null}
<div className="flex flex-wrap items-center gap-x-4 gap-y-1.5 text-xs text-muted-foreground">
{isSilentPayment ? (
<span className="inline-flex items-center gap-1.5">
<ShieldCheck className="size-3.5" />
{goalLabel ?? 'Private campaign'}
</span>
) : (
<span className="font-semibold text-foreground">
{raisedLabel}<span className="font-normal text-muted-foreground"> {goalLabel ? `/ ${goalLabel}` : 'raised'}</span>
</span>
)}
{countryLabel && (
<span className="inline-flex items-center gap-1.5">
{countryLabel}
</span>
)}
</div>
</div>
)}
/>
@@ -93,6 +122,7 @@ export function CampaignInlinePreview({ event }: { event: NostrEvent }) {
export function PledgeInlinePreview({ event }: { event: NostrEvent }) {
const { t } = useTranslation();
const pledge = parseAction(event);
const { data: btcPrice } = useBtcPrice();
if (!pledge) return null;
const naddr = nip19.naddrEncode({ kind: 36639, pubkey: pledge.pubkey, identifier: pledge.id });
@@ -110,7 +140,7 @@ export function PledgeInlinePreview({ event }: { event: NostrEvent }) {
<div className="flex flex-wrap items-center gap-x-4 gap-y-1.5 pt-1 text-xs text-muted-foreground">
<span className="inline-flex items-baseline gap-1.5">
<span className="font-semibold uppercase tracking-wide text-primary">{t('pledges.card.pledged')}</span>
<span className="text-sm font-bold text-foreground">{formatPledgeAmount(pledge.bounty)}</span>
<span className="text-sm font-bold text-foreground">{formatPledgeAmount(pledge.bounty, btcPrice)}</span>
</span>
{countryLabel && (
<span className="inline-flex items-center gap-1.5">
-25
View File
@@ -1,25 +0,0 @@
import { useEffect, useRef } from 'react';
import { useLocation } from 'react-router-dom';
import { useAudioPlayer } from '@/contexts/audioPlayerContextDef';
/**
* Auto-minimizes the audio player when the user navigates to a different page.
* No dialog — audio just keeps playing in the floating mini-bar.
*/
export function AudioNavigationGuard() {
const { currentTrack, minimized, minimize } = useAudioPlayer();
const location = useLocation();
const prevPath = useRef(location.pathname);
useEffect(() => {
if (location.pathname !== prevPath.current) {
// Route changed — minimize if playing and expanded
if (currentTrack && !minimized) {
minimize();
}
prevPath.current = location.pathname;
}
}, [location.pathname, currentTrack, minimized, minimize]);
return null;
}
+1 -1
View File
@@ -81,7 +81,7 @@ export function AudioVisualizer({
const primaryGlow = `hsl(${primaryHsl} / 0.55)`;
const analyser = analyserRef.current;
let dataArray: Uint8Array<ArrayBuffer> | null = null;
let dataArray: Uint8Array | null = null;
if (analyser && isPlaying) {
dataArray = new Uint8Array(analyser.frequencyBinCount);
analyser.getByteTimeDomainData(dataArray);
+149
View File
@@ -0,0 +1,149 @@
import { useCallback, useEffect, useRef, useState } from 'react';
import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group';
import { cn } from '@/lib/utils';
interface BitcoinAmountPickerProps {
usdAmount: number | string;
onUsdAmountChange: (amount: number | string) => void;
presets: readonly number[];
maxLabel?: string;
maxSelected?: boolean;
maxDisabled?: boolean;
onMaxSelect?: () => void;
insufficient?: boolean;
satsLabel?: string;
onAmountChangeStart?: () => void;
}
export function BitcoinAmountPicker({
usdAmount,
onUsdAmountChange,
presets,
maxLabel = 'MAX',
maxSelected = false,
maxDisabled = false,
onMaxSelect,
insufficient = false,
satsLabel,
onAmountChangeStart,
}: BitcoinAmountPickerProps) {
const [editingAmount, setEditingAmount] = useState(false);
const amountInputRef = useRef<HTMLInputElement>(null);
useEffect(() => {
if (editingAmount) {
amountInputRef.current?.focus();
amountInputRef.current?.select();
}
}, [editingAmount]);
const commitAmountEdit = useCallback(() => {
setEditingAmount(false);
if (typeof usdAmount === 'string' && usdAmount.trim() === '') {
onUsdAmountChange(0);
}
}, [onUsdAmountChange, usdAmount]);
const currentUsd = typeof usdAmount === 'string' ? parseFloat(usdAmount) : usdAmount;
return (
<>
<div className="flex flex-col items-center pt-2">
{editingAmount ? (
<div className="flex items-baseline justify-center">
<span className={cn('text-4xl font-semibold', insufficient ? 'text-destructive' : 'text-muted-foreground')}>$</span>
<input
ref={amountInputRef}
type="number"
inputMode="decimal"
min={0}
step="0.01"
value={usdAmount}
onChange={(e) => {
onAmountChangeStart?.();
onUsdAmountChange(e.target.value);
}}
onBlur={commitAmountEdit}
onKeyDown={(e) => {
if (e.key === 'Enter') {
e.preventDefault();
commitAmountEdit();
}
}}
aria-label="Amount in USD"
className={cn(
'bg-transparent border-0 outline-none text-4xl font-semibold text-center [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none',
insufficient && 'text-destructive',
)}
style={{ width: `${Math.max(2, String(usdAmount).length + 1)}ch` }}
/>
</div>
) : (
<button
type="button"
onClick={() => {
onAmountChangeStart?.();
setEditingAmount(true);
}}
aria-label="Edit amount"
className="flex items-baseline justify-center rounded-md px-2 -mx-2 hover:bg-muted/50 focus:outline-none focus-visible:ring-2 focus-visible:ring-ring transition-colors"
>
{maxSelected ? (
<span className={cn('text-4xl font-semibold tracking-tight', insufficient && 'text-destructive')}>
{maxLabel}
</span>
) : (
<>
<span className={cn('text-4xl font-semibold', insufficient ? 'text-destructive' : 'text-muted-foreground')}>$</span>
<span className={cn('text-4xl font-semibold tabular-nums', insufficient && 'text-destructive')}>
{Number.isFinite(currentUsd) && currentUsd > 0 ? currentUsd : 0}
</span>
</>
)}
</button>
)}
{satsLabel && (
<span className="text-xs text-muted-foreground mt-1 tabular-nums">
{satsLabel}
</span>
)}
</div>
<ToggleGroup
type="single"
value={maxSelected ? 'max' : presets.includes(Number(usdAmount)) ? String(usdAmount) : ''}
onValueChange={(value) => {
if (value) {
onAmountChangeStart?.();
if (value === 'max') {
onMaxSelect?.();
setEditingAmount(false);
return;
}
onUsdAmountChange(Number(value));
setEditingAmount(false);
}
}}
className="grid grid-cols-5 gap-1 w-full"
>
{presets.map((preset) => (
<ToggleGroupItem
key={preset}
value={String(preset)}
className="h-8 min-w-0 text-xs font-semibold px-1"
>
${preset}
</ToggleGroupItem>
))}
<ToggleGroupItem
value="max"
disabled={maxDisabled}
className="h-8 min-w-0 text-xs font-semibold px-1"
>
{maxLabel}
</ToggleGroupItem>
</ToggleGroup>
</>
);
}
+641
View File
@@ -0,0 +1,641 @@
import { useState } from 'react';
import { Link } from 'react-router-dom';
import {
ArrowDownLeft,
ArrowRight,
ArrowUpRight,
Bitcoin,
Check,
Clock,
Copy,
ExternalLink,
Hash,
Layers,
RefreshCw,
Weight,
} from 'lucide-react';
import { Button } from '@/components/ui/button';
import { Skeleton } from '@/components/ui/skeleton';
import { useBitcoinTx } from '@/hooks/useBitcoinTx';
import { useBitcoinAddress } from '@/hooks/useBitcoinAddress';
import { satsToBTC, satsToUSD, formatSats, formatBTC } from '@/lib/bitcoin';
import type { TxDetail, TxInput, TxOutput } from '@/lib/bitcoin';
// ---------------------------------------------------------------------------
// Shared helpers
// ---------------------------------------------------------------------------
function truncateMiddle(str: string, startLen = 8, endLen = 8): string {
if (str.length <= startLen + endLen + 3) return str;
return `${str.slice(0, startLen)}...${str.slice(-endLen)}`;
}
function CopyButton({ text }: { text: string }) {
const [copied, setCopied] = useState(false);
const handleCopy = async () => {
try {
await navigator.clipboard.writeText(text);
setCopied(true);
setTimeout(() => setCopied(false), 2000);
} catch {
// clipboard not available
}
};
return (
<button
onClick={handleCopy}
className="p-1 rounded hover:bg-muted/50 transition-colors text-muted-foreground hover:text-foreground cursor-pointer"
title="Copy"
>
{copied ? <Check className="size-3.5 text-green-500" /> : <Copy className="size-3.5" />}
</button>
);
}
/** Format a unix timestamp as a readable date string. */
function formatBlockTime(timestamp: number): string {
const date = new Date(timestamp * 1000);
return date.toLocaleString('en-US', {
year: 'numeric',
month: 'short',
day: 'numeric',
hour: '2-digit',
minute: '2-digit',
hour12: true,
});
}
/** Format a large number with locale separators. */
function formatNumber(n: number): string {
return n.toLocaleString();
}
// ---------------------------------------------------------------------------
// Bitcoin Transaction Header
// ---------------------------------------------------------------------------
export function BitcoinTxHeader({ txid }: { txid: string }) {
const { tx, btcPrice, isLoading, error } = useBitcoinTx(txid);
if (isLoading) return <TxSkeleton />;
if (error || !tx) {
return (
<div className="rounded-2xl border border-border p-6 text-center space-y-3">
<Bitcoin className="size-10 mx-auto text-muted-foreground/40" />
<p className="text-sm text-destructive">Failed to load transaction</p>
<p className="text-xs text-muted-foreground font-mono break-all">{txid}</p>
<a
href={`https://mempool.space/tx/${txid}`}
target="_blank"
rel="noopener noreferrer"
className="inline-flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors"
>
<Bitcoin className="size-3.5" />
<span>View on mempool.space</span>
<ExternalLink className="size-3" />
</a>
</div>
);
}
return (
<div className="rounded-2xl border border-border overflow-hidden">
{/* Header */}
<div className="p-5 space-y-4">
<div className="flex items-center gap-3">
<div className={`flex items-center justify-center size-10 rounded-full ${
tx.confirmed
? 'bg-green-500/10 text-green-600 dark:text-green-400'
: 'bg-orange-500/10 text-orange-600 dark:text-orange-400'
}`}>
{tx.confirmed ? <Check className="size-5" /> : <Clock className="size-5" />}
</div>
<div>
<h2 className="text-lg font-bold">
{tx.confirmed ? 'Confirmed' : 'Unconfirmed'}
</h2>
{tx.blockTime && (
<p className="text-sm text-muted-foreground">{formatBlockTime(tx.blockTime)}</p>
)}
</div>
</div>
{/* Transaction ID */}
<div className="space-y-1.5">
<p className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Transaction ID</p>
<div className="flex items-center gap-2">
<p className="text-sm font-mono text-foreground break-all">{tx.txid}</p>
<CopyButton text={tx.txid} />
</div>
</div>
{/* Stats grid */}
<div className="grid grid-cols-2 gap-3">
{tx.confirmed && tx.blockHeight !== undefined && (
<StatCard icon={<Layers className="size-3.5" />} label="Block" value={formatNumber(tx.blockHeight)} />
)}
<StatCard icon={<Weight className="size-3.5" />} label="Size" value={`${formatNumber(tx.weight / 4)} vB`} />
<StatCard
icon={<Bitcoin className="size-3.5" />}
label="Fee"
value={`${formatSats(tx.fee)} sat`}
subtitle={`${(tx.fee / (tx.weight / 4)).toFixed(1)} sat/vB`}
/>
<StatCard
icon={<Hash className="size-3.5" />}
label="Amount"
value={`${formatBTC(tx.totalOutput)} BTC`}
subtitle={btcPrice ? satsToUSD(tx.totalOutput, btcPrice) : undefined}
/>
</div>
</div>
{/* Inputs → Outputs flow */}
<div className="border-t border-border">
<TxFlow tx={tx} btcPrice={btcPrice} />
</div>
{/* Footer: link to mempool.space */}
<div className="border-t border-border px-5 py-2.5">
<a
href={`https://mempool.space/tx/${txid}`}
target="_blank"
rel="noopener noreferrer"
className="inline-flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors"
>
<Bitcoin className="size-3.5" />
<span>View on mempool.space</span>
<ExternalLink className="size-3" />
</a>
</div>
</div>
);
}
function StatCard({ icon, label, value, subtitle }: { icon: React.ReactNode; label: string; value: string; subtitle?: string }) {
return (
<div className="rounded-xl bg-secondary/40 px-3.5 py-2.5 space-y-0.5">
<div className="flex items-center gap-1.5 text-xs text-muted-foreground">
{icon}
<span>{label}</span>
</div>
<p className="text-sm font-semibold">{value}</p>
{subtitle && <p className="text-xs text-muted-foreground">{subtitle}</p>}
</div>
);
}
/** Inputs → Outputs visualization, mempool.space-style. */
function TxFlow({ tx, btcPrice }: { tx: TxDetail; btcPrice?: number }) {
return (
<div className="p-4 space-y-3">
<div className="flex items-center gap-2 text-xs font-medium text-muted-foreground uppercase tracking-wider px-1">
<span>{tx.inputs.length} Input{tx.inputs.length !== 1 ? 's' : ''}</span>
<ArrowRight className="size-3" />
<span>{tx.outputs.length} Output{tx.outputs.length !== 1 ? 's' : ''}</span>
</div>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
{/* Inputs */}
<div className="space-y-1.5">
{tx.inputs.slice(0, 10).map((input, i) => (
<TxInputRow key={`${input.txid}-${input.vout}-${i}`} input={input} btcPrice={btcPrice} />
))}
{tx.inputs.length > 10 && (
<p className="text-xs text-muted-foreground text-center py-1">
+{tx.inputs.length - 10} more input{tx.inputs.length - 10 !== 1 ? 's' : ''}
</p>
)}
</div>
{/* Outputs */}
<div className="space-y-1.5">
{tx.outputs.slice(0, 10).map((output, i) => (
<TxOutputRow key={`${output.address ?? 'op_return'}-${i}`} output={output} btcPrice={btcPrice} />
))}
{tx.outputs.length > 10 && (
<p className="text-xs text-muted-foreground text-center py-1">
+{tx.outputs.length - 10} more output{tx.outputs.length - 10 !== 1 ? 's' : ''}
</p>
)}
</div>
</div>
</div>
);
}
function TxInputRow({ input, btcPrice }: { input: TxInput; btcPrice?: number }) {
if (input.isCoinbase) {
return (
<div className="rounded-lg bg-amber-500/5 border border-amber-500/20 px-3 py-2">
<div className="flex items-center justify-between gap-2">
<span className="text-xs font-medium text-amber-600 dark:text-amber-400">Coinbase</span>
<span className="text-xs font-mono">{formatBTC(input.value)} BTC</span>
</div>
</div>
);
}
return (
<div className="rounded-lg bg-red-500/5 border border-red-500/10 px-3 py-2 space-y-0.5">
<div className="flex items-center justify-between gap-2">
{input.address ? (
<Link
to={`/i/bitcoin:address:${input.address}`}
className="text-xs font-mono text-red-600 dark:text-red-400 hover:underline truncate"
>
{truncateMiddle(input.address, 10, 6)}
</Link>
) : (
<span className="text-xs text-muted-foreground">Unknown</span>
)}
<span className="text-xs font-mono shrink-0">{formatBTC(input.value)} BTC</span>
</div>
{btcPrice !== undefined && (
<p className="text-[10px] text-muted-foreground text-right">{satsToUSD(input.value, btcPrice)}</p>
)}
</div>
);
}
function TxOutputRow({ output, btcPrice }: { output: TxOutput; btcPrice?: number }) {
const isOpReturn = output.scriptpubkeyType === 'op_return';
if (isOpReturn) {
return (
<div className="rounded-lg bg-secondary/60 border border-border/50 px-3 py-2">
<span className="text-xs text-muted-foreground">OP_RETURN</span>
</div>
);
}
return (
<div className="rounded-lg bg-green-500/5 border border-green-500/10 px-3 py-2 space-y-0.5">
<div className="flex items-center justify-between gap-2">
{output.address ? (
<Link
to={`/i/bitcoin:address:${output.address}`}
className="text-xs font-mono text-green-600 dark:text-green-400 hover:underline truncate"
>
{truncateMiddle(output.address, 10, 6)}
</Link>
) : (
<span className="text-xs text-muted-foreground">Unknown</span>
)}
<span className="text-xs font-mono shrink-0">{formatBTC(output.value)} BTC</span>
</div>
{btcPrice !== undefined && (
<p className="text-[10px] text-muted-foreground text-right">{satsToUSD(output.value, btcPrice)}</p>
)}
</div>
);
}
function TxSkeleton() {
return (
<div className="rounded-2xl border border-border overflow-hidden">
<div className="p-5 space-y-4">
<div className="flex items-center gap-3">
<Skeleton className="size-10 rounded-full" />
<div className="space-y-1.5">
<Skeleton className="h-5 w-28" />
<Skeleton className="h-3.5 w-40" />
</div>
</div>
<div className="space-y-1.5">
<Skeleton className="h-3 w-24" />
<Skeleton className="h-4 w-full" />
</div>
<div className="grid grid-cols-2 gap-3">
<Skeleton className="h-16 rounded-xl" />
<Skeleton className="h-16 rounded-xl" />
<Skeleton className="h-16 rounded-xl" />
<Skeleton className="h-16 rounded-xl" />
</div>
</div>
<div className="border-t border-border p-4 space-y-3">
<Skeleton className="h-3 w-32" />
<div className="grid grid-cols-2 gap-3">
<div className="space-y-1.5">
<Skeleton className="h-12 rounded-lg" />
<Skeleton className="h-12 rounded-lg" />
</div>
<div className="space-y-1.5">
<Skeleton className="h-12 rounded-lg" />
<Skeleton className="h-12 rounded-lg" />
</div>
</div>
</div>
</div>
);
}
// ---------------------------------------------------------------------------
// Bitcoin Address Header
// ---------------------------------------------------------------------------
export function BitcoinAddressHeader({ address }: { address: string }) {
const { addressDetail, btcPrice, isLoading, error, refetch } = useBitcoinAddress(address);
if (isLoading) return <AddressSkeleton />;
if (error || !addressDetail) {
return (
<div className="rounded-2xl border border-border p-6 text-center space-y-3">
<Bitcoin className="size-10 mx-auto text-muted-foreground/40" />
<p className="text-sm text-destructive">Failed to load address</p>
<p className="text-xs text-muted-foreground font-mono break-all">{address}</p>
<Button variant="outline" size="sm" onClick={() => refetch()}>
<RefreshCw className="size-3.5 mr-1.5" />
Retry
</Button>
</div>
);
}
return (
<div className="rounded-2xl border border-border overflow-hidden">
{/* Header */}
<div className="p-5 space-y-4">
<div className="flex items-center gap-3">
<div className="flex items-center justify-center size-10 rounded-full bg-primary/10 text-primary">
<Bitcoin className="size-5" />
</div>
<div>
<h2 className="text-lg font-bold">Bitcoin Address</h2>
<p className="text-xs text-muted-foreground">
{addressDetail.txCount + addressDetail.pendingTxCount} transaction{(addressDetail.txCount + addressDetail.pendingTxCount) !== 1 ? 's' : ''}
</p>
</div>
</div>
{/* Address */}
<div className="space-y-1.5">
<p className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Address</p>
<div className="flex items-center gap-2">
<p className="text-sm font-mono text-foreground break-all">{address}</p>
<CopyButton text={address} />
</div>
</div>
{/* Balance hero */}
<div className="rounded-xl bg-secondary/40 p-4 text-center space-y-1">
<p className="text-xs text-muted-foreground uppercase tracking-wider">Balance</p>
<p className="text-3xl font-bold tracking-tight">
{btcPrice ? satsToUSD(addressDetail.totalBalance, btcPrice) : `${formatBTC(addressDetail.totalBalance)} BTC`}
</p>
<p className="text-sm text-muted-foreground">
{formatBTC(addressDetail.totalBalance)} BTC
</p>
{addressDetail.pendingBalance !== 0 && (
<p className="flex items-center justify-center gap-1 text-xs text-orange-500 dark:text-orange-400 pt-1">
<RefreshCw className="size-3 animate-spin" />
{btcPrice
? `${satsToUSD(addressDetail.pendingBalance, btcPrice)} pending`
: `${formatBTC(addressDetail.pendingBalance)} BTC pending`}
</p>
)}
</div>
{/* Stats grid */}
<div className="grid grid-cols-2 gap-3">
<StatCard
icon={<ArrowDownLeft className="size-3.5" />}
label="Total Received"
value={`${formatBTC(addressDetail.totalReceived)} BTC`}
subtitle={btcPrice ? satsToUSD(addressDetail.totalReceived, btcPrice) : undefined}
/>
<StatCard
icon={<ArrowUpRight className="size-3.5" />}
label="Total Sent"
value={`${formatBTC(addressDetail.totalSent)} BTC`}
subtitle={btcPrice ? satsToUSD(addressDetail.totalSent, btcPrice) : undefined}
/>
</div>
</div>
{/* Recent Transactions */}
{addressDetail.recentTxs.length > 0 && (
<div className="border-t border-border">
<div className="px-5 py-3">
<p className="text-xs font-medium text-muted-foreground uppercase tracking-wider">
Recent Transactions
</p>
</div>
<div className="divide-y divide-border">
{addressDetail.recentTxs.slice(0, 10).map((tx) => (
<AddressTxRow key={tx.txid} tx={tx} btcPrice={btcPrice} />
))}
</div>
{addressDetail.recentTxs.length > 10 && (
<div className="px-5 py-3 text-center">
<p className="text-xs text-muted-foreground">
{addressDetail.txCount - 10} more transaction{addressDetail.txCount - 10 !== 1 ? 's' : ''}
</p>
</div>
)}
</div>
)}
{/* Footer: link to mempool.space */}
<div className="border-t border-border px-5 py-2.5">
<a
href={`https://mempool.space/address/${address}`}
target="_blank"
rel="noopener noreferrer"
className="inline-flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors"
>
<Bitcoin className="size-3.5" />
<span>View on mempool.space</span>
<ExternalLink className="size-3" />
</a>
</div>
</div>
);
}
function AddressTxRow({ tx, btcPrice }: { tx: { txid: string; amount: number; type: 'receive' | 'send'; confirmed: boolean; timestamp?: number }; btcPrice?: number }) {
const isReceive = tx.type === 'receive';
return (
<Link
to={`/i/bitcoin:tx:${tx.txid}`}
className="flex items-center justify-between py-3 px-5 hover:bg-muted/50 transition-colors"
>
<div className="flex items-center gap-3">
<div className={`flex items-center justify-center size-8 rounded-full ${
isReceive
? 'bg-green-500/10 text-green-600 dark:text-green-400'
: 'bg-red-500/10 text-red-600 dark:text-red-400'
}`}>
{isReceive ? <ArrowDownLeft className="size-4" /> : <ArrowUpRight className="size-4" />}
</div>
<div>
<p className="text-sm font-medium">{isReceive ? 'Received' : 'Sent'}</p>
<p className="text-xs text-muted-foreground font-mono">{truncateMiddle(tx.txid, 8, 8)}</p>
</div>
</div>
<div className="text-right">
<p className={`text-sm font-medium ${
isReceive ? 'text-green-600 dark:text-green-400' : 'text-red-600 dark:text-red-400'
}`}>
{isReceive ? '+' : '-'}{formatBTC(tx.amount)} BTC
</p>
{btcPrice && (
<p className="text-xs text-muted-foreground">
{satsToUSD(tx.amount, btcPrice)}
</p>
)}
</div>
</Link>
);
}
function AddressSkeleton() {
return (
<div className="rounded-2xl border border-border overflow-hidden">
<div className="p-5 space-y-4">
<div className="flex items-center gap-3">
<Skeleton className="size-10 rounded-full" />
<div className="space-y-1.5">
<Skeleton className="h-5 w-32" />
<Skeleton className="h-3.5 w-24" />
</div>
</div>
<div className="space-y-1.5">
<Skeleton className="h-3 w-16" />
<Skeleton className="h-4 w-full" />
</div>
<div className="rounded-xl bg-secondary/40 p-4 space-y-2 flex flex-col items-center">
<Skeleton className="h-3 w-12" />
<Skeleton className="h-9 w-40" />
<Skeleton className="h-4 w-28" />
</div>
<div className="grid grid-cols-2 gap-3">
<Skeleton className="h-16 rounded-xl" />
<Skeleton className="h-16 rounded-xl" />
</div>
</div>
</div>
);
}
// ---------------------------------------------------------------------------
// Compact previews (used in NoteCard embeds, hover cards, etc.)
// ---------------------------------------------------------------------------
/** Compact preview for a Bitcoin transaction — fetches real data. */
export function BitcoinTxPreview({ txid, link }: { txid: string; link: string }) {
const { tx, btcPrice, isLoading } = useBitcoinTx(txid);
if (isLoading) {
return (
<div className="px-4 py-3 border-b border-border">
<div className="flex items-center gap-3">
<Skeleton className="size-12 rounded-lg shrink-0" />
<div className="flex-1 min-w-0 space-y-1.5">
<Skeleton className="h-3 w-32" />
<Skeleton className="h-4 w-3/4" />
</div>
</div>
</div>
);
}
const amount = tx ? tx.totalOutput : 0;
const fee = tx?.fee ?? 0;
return (
<Link
to={link}
className="flex items-center gap-3 px-4 py-3 border-b border-border hover:bg-secondary/30 transition-colors"
>
<div className="size-12 rounded-lg bg-orange-500/10 flex items-center justify-center shrink-0">
<Bitcoin className="size-5 text-orange-600 dark:text-orange-400" />
</div>
<div className="flex-1 min-w-0">
<div className="flex items-center gap-1.5 text-xs text-muted-foreground">
<Bitcoin className="size-3 shrink-0" />
<span>Bitcoin Transaction</span>
{tx && (
<span className={tx.confirmed
? 'text-green-600 dark:text-green-400'
: 'text-yellow-600 dark:text-yellow-400'
}>
{tx.confirmed ? 'Confirmed' : 'Unconfirmed'}
</span>
)}
</div>
<p className="text-sm font-medium truncate mt-0.5">
{tx ? `${satsToBTC(amount)} BTC` : truncateMiddle(txid, 12, 8)}
{tx && btcPrice ? (
<span className="text-muted-foreground font-normal"> ({satsToUSD(amount, btcPrice)})</span>
) : null}
</p>
{tx && (
<p className="text-xs text-muted-foreground truncate">
Fee {formatSats(fee)} sats
{tx.blockHeight ? ` · Block ${tx.blockHeight.toLocaleString()}` : ''}
</p>
)}
</div>
<ExternalLink className="size-4 text-muted-foreground shrink-0" />
</Link>
);
}
/** Compact preview for a Bitcoin address — fetches real data. */
export function BitcoinAddressPreview({ address, link }: { address: string; link: string }) {
const { addressDetail, btcPrice, isLoading } = useBitcoinAddress(address);
if (isLoading) {
return (
<div className="px-4 py-3 border-b border-border">
<div className="flex items-center gap-3">
<Skeleton className="size-12 rounded-lg shrink-0" />
<div className="flex-1 min-w-0 space-y-1.5">
<Skeleton className="h-3 w-28" />
<Skeleton className="h-4 w-3/4" />
</div>
</div>
</div>
);
}
const balance = addressDetail?.totalBalance ?? 0;
const txCount = addressDetail ? addressDetail.txCount + addressDetail.pendingTxCount : 0;
return (
<Link
to={link}
className="flex items-center gap-3 px-4 py-3 border-b border-border hover:bg-secondary/30 transition-colors"
>
<div className="size-12 rounded-lg bg-orange-500/10 flex items-center justify-center shrink-0">
<Bitcoin className="size-5 text-orange-600 dark:text-orange-400" />
</div>
<div className="flex-1 min-w-0">
<div className="flex items-center gap-1.5 text-xs text-muted-foreground">
<Bitcoin className="size-3 shrink-0" />
<span>Bitcoin Address</span>
</div>
<p className="text-sm font-medium truncate mt-0.5">
{addressDetail ? `${satsToBTC(balance)} BTC` : truncateMiddle(address, 12, 8)}
{addressDetail && btcPrice ? (
<span className="text-muted-foreground font-normal"> ({satsToUSD(balance, btcPrice)})</span>
) : null}
</p>
{addressDetail && (
<p className="text-xs text-muted-foreground truncate">
{txCount.toLocaleString()} transaction{txCount !== 1 ? 's' : ''}
{' · '}
<span className="font-mono">{truncateMiddle(address, 8, 6)}</span>
</p>
)}
</div>
<ExternalLink className="size-4 text-muted-foreground shrink-0" />
</Link>
);
}
+136
View File
@@ -0,0 +1,136 @@
import type { ReactNode } from 'react';
import { AlertTriangle } from 'lucide-react';
import { useTranslation } from 'react-i18next';
import { Alert, AlertDescription } from '@/components/ui/alert';
import { Checkbox } from '@/components/ui/checkbox';
import {
Popover,
PopoverContent,
PopoverTrigger,
} from '@/components/ui/popover';
import { cn } from '@/lib/utils';
/**
* - `destructive`: red, with a warning icon. Used in high-stakes contexts
* like the wallet's Send dialog where the disclaimer also gates an
* acknowledgement checkbox.
* - `soft`: amber, no icon. Used as an informational notice in lower-stakes
* contexts (e.g. campaign donation surfaces) where we don't want to
* imply the donor is about to do something dangerous.
*/
type Tone = 'destructive' | 'soft';
interface BitcoinPublicDisclaimerProps {
/**
* When provided, render an "I understand this transaction is public"
* acknowledgement checkbox below the warning. Callers should typically
* gate the primary action (Send / Donate / Review / Open in wallet) on
* `acknowledged === true`. When omitted, the disclaimer renders as an
* informational notice with no interactive control.
*/
acknowledged?: boolean;
onAcknowledgedChange?: (acknowledged: boolean) => void;
/** Optional override for the lead sentence (e.g. "Donations" instead of "Money"). */
leadText?: string;
/** Visual treatment. Defaults to `destructive` for backwards compatibility with the wallet's Send dialog. */
tone?: Tone;
/**
* Whether the "Learn more" popover should include the
* "or cash out at an exchange" advice. Relevant in the wallet (the
* user holds Bitcoin and could cash out) but not on a campaign page
* (the donor is sending money away, not deciding what to do with it).
* Defaults to `true` for backwards compatibility.
*/
includeCashOutAdvice?: boolean;
/**
* Override the popover body. When set, replaces the entire "Bitcoin
* is a public ledger…" paragraph (including the cash-out advice). Use
* when the calling surface has a meaningfully different audience —
* e.g. a campaign *creator* configuring a receive address, vs. the
* sender flow this component was originally written for.
*/
popoverText?: ReactNode;
}
/**
* Privacy disclaimer for on-chain Bitcoin payments. Bitcoin is a public
* ledger and the transaction can be traced back to the sender forever.
* Used wherever the user initiates an on-chain payment — wallet sends to
* raw addresses, campaign donations (BIP-21 panels, in-app PSBT
* donations, external-wallet fallbacks).
*/
export function BitcoinPublicDisclaimer({
acknowledged,
onAcknowledgedChange,
leadText,
tone = 'destructive',
includeCashOutAdvice = true,
popoverText,
}: BitcoinPublicDisclaimerProps) {
const { t } = useTranslation();
const showCheckbox = onAcknowledgedChange !== undefined;
const isSoft = tone === 'soft';
const resolvedLeadText = leadText ?? t('bitcoinPublic.lead');
return (
<Alert
// For `soft` we drop the role="alert" semantics — it's informational,
// not an active warning the user must respond to.
role={isSoft ? 'note' : 'alert'}
className={cn(
isSoft
// Use the project's foreground token (not raw amber-900) so
// the text always contrasts against the page in both light
// and dark themes. The faint amber tint keeps the
// "informational notice" cue without leaning on hard-coded
// amber text that disappears on the wrong backdrop.
? 'border-amber-500/30 bg-amber-500/10 text-foreground'
: 'border-destructive/50 bg-destructive/5 text-destructive dark:border-destructive',
)}
>
{/* Icon only on the destructive variant. The shadcn Alert reserves
left padding for an icon via `[&>svg~*]:pl-7`, so omitting the
icon also reclaims the indent. */}
{!isSoft && <AlertTriangle className="size-4 text-destructive" />}
<AlertDescription className="text-xs">
<p>
{resolvedLeadText}{' '}
<Popover>
<PopoverTrigger asChild>
<button
type="button"
className="underline underline-offset-2 font-medium hover:opacity-80 focus:outline-none focus-visible:ring-2 focus-visible:ring-ring rounded-sm"
>
{t('bitcoinPublic.learnMore')}
</button>
</PopoverTrigger>
<PopoverContent side="top" align="start" className="w-72 text-xs leading-relaxed">
{popoverText ?? (
includeCashOutAdvice
? t('bitcoinPublic.bodyWithCashOut')
: t('bitcoinPublic.body')
)}
</PopoverContent>
</Popover>
</p>
{showCheckbox && (
<label className="mt-2 flex items-start gap-2 cursor-pointer select-none">
<Checkbox
checked={acknowledged ?? false}
onCheckedChange={(checked) => onAcknowledgedChange(checked === true)}
className={cn(
'mt-0.5',
isSoft
? 'border-amber-600 data-[state=checked]:bg-amber-600 data-[state=checked]:text-white dark:border-amber-400 dark:data-[state=checked]:bg-amber-500'
: 'border-destructive data-[state=checked]:bg-destructive data-[state=checked]:text-destructive-foreground',
)}
aria-label={t('bitcoinPublic.iUnderstand')}
/>
<span>{t('bitcoinPublic.iUnderstand')}</span>
</label>
)}
</AlertDescription>
</Alert>
);
}
+610
View File
@@ -0,0 +1,610 @@
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import type { ClipboardEvent } from 'react';
import { useTranslation } from 'react-i18next';
import { AlertTriangle, Bitcoin, EyeOff, QrCode, X } from 'lucide-react';
import { Input } from '@/components/ui/input';
import {
Popover,
PopoverAnchor,
PopoverContent,
} from '@/components/ui/popover';
import { QrScannerDialog } from '@/components/QrScannerDialog';
import { useToast } from '@/hooks/useToast';
import { parseBitcoinUri, validateBitcoinAddress } from '@/lib/bitcoin';
import {
isSilentPaymentAddress,
validateSilentPaymentAddress,
} from '@/lib/hdwallet/sp/sender';
import { cn } from '@/lib/utils';
// ---------------------------------------------------------------------------
// Public types
// ---------------------------------------------------------------------------
/**
* The resolved recipient produced by {@link BitcoinRecipientInput}.
*
* Either a bare on-chain Bitcoin address (`kind === 'address'`) or a BIP-352
* silent payment address (`kind === 'sp'`). The dialog consumes this shape
* directly when building the PSBT.
*/
export interface ResolvedRecipient {
/**
* For `kind === 'address'`: a validated mainnet on-chain address.
* For `kind === 'sp'`: the `sp1…` string (the real P2TR `P_k` is derived
* at PSBT-build time, after coin selection).
*/
address: string;
/** Recipient kind — determines how the PSBT builder routes the output. */
kind: 'address' | 'sp';
/**
* Raw text the user typed / pasted / scanned. Kept so the picker can
* round-trip a chip back into the input on clear if we ever need it
* (currently unused; the chip just dismisses).
*/
raw: string;
}
// ---------------------------------------------------------------------------
// Candidate extraction
// ---------------------------------------------------------------------------
/**
* Resolve a piece of recipient text into the valid on-chain and/or
* silent-payment candidates it carries.
*
* Handles bare `bc1…` / `sp1…` addresses and `bitcoin:` BIP-21 URIs (which
* may carry an on-chain path, an `sp=` parameter, or both). Returns empty
* strings for whichever kind isn't present/valid. Shared by the live
* input memo and the paste handler so both agree on what counts.
*/
function resolveCandidates(text: string): { btc: string; sp: string } {
const trimmed = text.trim();
if (!trimmed) return { btc: '', sp: '' };
const bip21 = parseBitcoinUri(trimmed);
// On-chain: the URI path (when present) or the raw input. SP addresses
// live in the `sp` field; don't double-count them as on-chain.
const btcRaw = bip21 ? bip21.address : trimmed;
const btc =
btcRaw && !isSilentPaymentAddress(btcRaw) && validateBitcoinAddress(btcRaw)
? btcRaw
: '';
// Silent payment: prefer the URI `sp=` parameter; otherwise the path may
// itself be an sp1 address (rare but legal — `bitcoin:sp1…` is a URI
// without an on-chain fallback), or the raw input is a bare sp1.
const spRaw = bip21 ? (bip21.sp ?? bip21.address) : trimmed;
const sp =
spRaw && isSilentPaymentAddress(spRaw) && validateSilentPaymentAddress(spRaw)
? spRaw
: '';
return { btc, sp };
}
// ---------------------------------------------------------------------------
// Component
// ---------------------------------------------------------------------------
interface BitcoinRecipientInputProps {
/** Currently-selected recipient, or `null` when nothing has been picked. */
value: ResolvedRecipient | null;
/** Called when the user picks a recipient (from the dropdown / QR scan) or clears. */
onChange: (value: ResolvedRecipient | null) => void;
/** Input placeholder text. */
placeholder: string;
/**
* Optional initial input value applied when the picker mounts with no
* `value`. Used by callers (e.g. campaign donate flow) that want to
* pre-fill a `bitcoin:…` URI or bare address so the donor only needs to
* pick from the dropdown.
*
* Applied on mount only. Clearing a selected chip (value → null) returns
* to an empty input rather than restoring the prefill.
*/
initialInput?: string;
}
/**
* Recipient input for the Send Bitcoin dialog. Combines a text input, an
* inline QR-scanner button, and a Radix Popover dropdown that surfaces the
* recognised destination(s) extracted from the input.
*
* Recognised destinations:
*
* - Bare on-chain Bitcoin address (any standard mainnet type) → "Send to
* Bitcoin address" row.
* - Bare BIP-352 silent payment address (`sp1…`) → "Send to silent payment
* address" row.
* - `bitcoin:` BIP-21 URI with an on-chain path and/or an `sp=` parameter →
* one row per valid candidate (so a URI carrying both shows two rows and
* the donor picks privacy vs. compatibility).
*
* Clicking a row swaps the input out for a {@link SelectedRecipientChip} via
* `onChange`. Clicking the chip's X button calls `onChange(null)`, which
* returns to the input view.
*
* Anything else (npub, nprofile, free text) is silently ignored — there is
* no account search here, by design. The dropdown stays open as long as the
* input holds at least one valid candidate; it doesn't dismiss when the
* input loses focus or the user taps elsewhere. It closes only on selection,
* when the input is cleared, or on Escape.
*/
export function BitcoinRecipientInput({
value,
onChange,
placeholder,
initialInput,
}: BitcoinRecipientInputProps) {
const { t } = useTranslation();
const { toast } = useToast();
// Local input state. Independent of `value` so the user can keep typing
// after dismissing the dropdown without losing their query, and so the
// chip-cleared view starts blank instead of repopulating the previous
// selection. `initialInput` only seeds the field on first mount —
// clearing the chip (value → null) returns to an empty input, not the
// prefill.
const [query, setQuery] = useState<string>(initialInput ?? '');
const [open, setOpen] = useState(false);
// Tracks whether the popover has been opened at least once for the
// current query. The "choose a payment method" hint suppresses on the
// very first render so callers prefilling the input don't see the hint
// flash for one frame before the auto-open effect runs.
const [hasOpenedForQuery, setHasOpenedForQuery] = useState(false);
const [scannerOpen, setScannerOpen] = useState(false);
const inputRef = useRef<HTMLInputElement>(null);
// ── Candidate extraction ──────────────────────────────────────────────
//
// BIP-21 `bitcoin:` URI handling. If the input is a URI, we route the
// same way the QR scanner does: surface every valid candidate as its own
// row so the user explicitly picks privacy (sp) vs. compatibility
// (on-chain). A raw bc1…/sp1… input falls through here unchanged: `bip21`
// is null and the candidate is just the trimmed query.
const trimmed = query.trim();
const { btc: btcCandidate, sp: spCandidate } = useMemo(
() => resolveCandidates(trimmed),
[trimmed],
);
const hasBtc = !!btcCandidate;
const hasSp = !!spCandidate;
const totalItems = (hasSp ? 1 : 0) + (hasBtc ? 1 : 0);
// Auto-open the dropdown whenever a candidate is available, auto-close on
// empty input.
useEffect(() => {
if (trimmed.length === 0) {
setOpen(false);
setHasOpenedForQuery(false);
return;
}
if (hasSp || hasBtc) setOpen(true);
}, [trimmed, hasSp, hasBtc]);
// Track the first time the popover opens for the current query, so the
// "choose a payment method" hint only appears after the donor has had a
// chance to see (and dismiss) the dropdown — not flash for one paint
// frame between mount and the auto-open effect above.
useEffect(() => {
if (open) setHasOpenedForQuery(true);
}, [open]);
// ── Selection callbacks ───────────────────────────────────────────────
const selectBtc = useCallback(
(address: string) => {
onChange({ address, kind: 'address', raw: query });
setQuery('');
setOpen(false);
inputRef.current?.blur();
},
[onChange, query],
);
const selectSp = useCallback(
(address: string) => {
onChange({ address, kind: 'sp', raw: query });
setQuery('');
setOpen(false);
inputRef.current?.blur();
},
[onChange, query],
);
// ── Mount-time auto-select for single-endpoint prefills ────────────────
//
// When the picker mounts pre-filled (e.g. the campaign "Pay with Agora"
// flow) and `initialInput` resolves to exactly one valid candidate, skip
// the dropdown and select it directly so it lands as a chip. When the
// prefill carries *both* an on-chain address and an sp1 code we leave it
// in the input and let the dropdown surface both rows — that's a genuine
// choice the donor must make (privacy vs. compatibility).
//
// Guarded by a ref so it fires once per mount and never overrides a
// selection the user has already made or a `clear chip → restore prefill`
// transition (the picker is keyed on each open in the dialog, so a fresh
// mount is the right granularity).
const autoSelectedRef = useRef(false);
useEffect(() => {
if (autoSelectedRef.current) return;
autoSelectedRef.current = true;
if (value || !initialInput) return;
if (totalItems !== 1) return;
if (hasSp) {
selectSp(spCandidate);
} else if (hasBtc) {
selectBtc(btcCandidate);
}
// Intentionally mount-only: candidates are derived from `initialInput`
// (via the initial `query`), so reading them here reflects the prefill.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
// ── Paste auto-select ──────────────────────────────────────────────────
//
// When the user pastes text that resolves to exactly one valid candidate
// (a bare `bc1…` / `sp1…` address or a single-endpoint `bitcoin:` URI),
// convert it straight into a chip instead of making them click the lone
// dropdown row. A paste carrying *both* an on-chain address and an sp1
// code falls through to the normal dropdown so the donor picks privacy
// vs. compatibility.
//
// We resolve from the pasted text directly because `query` state hasn't
// updated yet inside the paste event. Returning early on a single match
// lets us `preventDefault()` so the input never flickers the raw text.
const handlePaste = useCallback(
(e: ClipboardEvent<HTMLInputElement>) => {
const pasted = e.clipboardData.getData('text');
if (!pasted) return;
const { btc, sp } = resolveCandidates(pasted);
const count = (btc ? 1 : 0) + (sp ? 1 : 0);
if (count !== 1) return; // 0 → let it land as text; 2 → use the dropdown.
e.preventDefault();
if (btc) {
onChange({ address: btc, kind: 'address', raw: pasted.trim() });
} else {
onChange({ address: sp, kind: 'sp', raw: pasted.trim() });
}
setQuery('');
setOpen(false);
inputRef.current?.blur();
},
[onChange],
);
// ── QR scan handling ──────────────────────────────────────────────────
/**
* Interpret a freshly-scanned QR code.
*
* - **BIP-21 URI with valid bc1 *and* sp1** → drop the URI into the input
* and open the dropdown so the donor picks between them.
* - **BIP-21 URI with only `sp=` valid** → select SP directly (creates
* the chip, bypasses the dropdown).
* - **Bare bitcoin address** → select on-chain directly.
* - **Bare `sp1…` address** → select SP directly.
* - **Anything else** → toast.
*/
const handleScan = useCallback(
(scanned: string) => {
setScannerOpen(false);
const text = scanned.trim();
const parsed = parseBitcoinUri(text);
const candidate = parsed ? parsed.address : text;
const sp = parsed?.sp;
const hasValidBtc = !!candidate && validateBitcoinAddress(candidate);
const hasValidSp =
!!sp && isSilentPaymentAddress(sp) && validateSilentPaymentAddress(sp);
// Both options — show the dropdown.
if (parsed && hasValidBtc && hasValidSp) {
setQuery(text);
setOpen(true);
// Focus is best-effort; on mobile the scanner dialog dismissal will
// already steal focus and the dropdown stays usable via tap.
inputRef.current?.focus();
return;
}
// SP-only via `bitcoin:…?sp=sp1…`.
if (hasValidSp && sp) {
selectSp(sp);
return;
}
// Direct on-chain.
if (hasValidBtc) {
selectBtc(candidate);
return;
}
// Bare sp1 (no `bitcoin:` prefix).
if (
isSilentPaymentAddress(candidate)
&& validateSilentPaymentAddress(candidate)
) {
selectSp(candidate);
return;
}
toast({
title: t('walletSend.scanError.title'),
description: t('walletSend.scanError.description'),
variant: 'destructive',
});
},
[selectBtc, selectSp, t, toast],
);
// ── Chip view ─────────────────────────────────────────────────────────
if (value) {
return (
<SelectedRecipientChip value={value} onClear={() => onChange(null)} />
);
}
// ── Input + dropdown ──────────────────────────────────────────────────
//
// `popoverOpen` derives from the manual `open` flag AND the presence of
// actionable candidates. This prevents an empty/garbage input from
// popping the dropdown.
const popoverOpen = open && totalItems > 0;
return (
<div className="space-y-2">
<Popover open={popoverOpen} onOpenChange={setOpen}>
<PopoverAnchor asChild>
<div className="relative flex items-center">
<Input
ref={inputRef}
id="hd-recipient-input"
value={query}
onChange={(e) => setQuery(e.target.value)}
onPaste={handlePaste}
// Reopen on focus so a user can recover the dropdown after an
// outside-click dismiss (the value is still in the field).
onFocus={() => {
if (totalItems > 0) setOpen(true);
}}
// `onFocus` only fires on the first tap; subsequent taps while
// the input is still focused need their own opener so the user
// can reopen the choice list without un-focusing first.
onClick={() => {
if (totalItems > 0) setOpen(true);
}}
placeholder={placeholder}
autoComplete="off"
spellCheck={false}
role="combobox"
aria-expanded={popoverOpen}
aria-haspopup="listbox"
aria-autocomplete="list"
className={cn('font-mono text-base md:text-sm pr-11')}
/>
<button
type="button"
onClick={() => setScannerOpen(true)}
aria-label={t('walletSend.recipient.scan')}
className="absolute right-1 top-1/2 -translate-y-1/2 size-8 rounded-full text-muted-foreground hover:text-foreground hover:bg-secondary/60 flex items-center justify-center motion-safe:transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-ring"
>
<QrCode className="size-4" />
</button>
</div>
</PopoverAnchor>
<PopoverContent
align="start"
sideOffset={6}
// Keep typing focus in the input on open/close — Radix's default
// is to focus the popover content, which would steal focus from
// the input and dismiss the mobile keyboard mid-type.
onOpenAutoFocus={(e) => e.preventDefault()}
onCloseAutoFocus={(e) => e.preventDefault()}
// The dropdown is a persistent choice list, not a transient
// hover-popover: it should stay open even when the input loses
// focus or the user taps elsewhere on the page, so blurring out
// doesn't make the candidate rows vanish. We block Radix's
// auto-dismiss-on-outside-interaction and instead close the
// dropdown explicitly — on selection, on a cleared input
// (the auto-open effect), or via Escape (still honored below).
onFocusOutside={(e) => e.preventDefault()}
onPointerDownOutside={(e) => e.preventDefault()}
onInteractOutside={(e) => e.preventDefault()}
style={{ width: 'var(--radix-popover-trigger-width)' }}
className="p-0 w-[--radix-popover-trigger-width] max-h-none rounded-xl border border-border bg-popover shadow-lg overflow-hidden"
>
<div role="listbox" className="max-h-[280px] overflow-y-auto py-1">
{/* BTC comes before SP — the on-chain address is the
broadly-compatible default; the silent-payment option
follows for donors who want privacy. */}
{hasBtc && (
<BtcAddressRow address={btcCandidate} onClick={selectBtc} />
)}
{hasSp && (
<SpAddressRow address={spCandidate} onClick={selectSp} />
)}
</div>
</PopoverContent>
</Popover>
{/* Picker-closed reminder. When the input holds parseable candidates
but the donor hasn't actually picked one yet — typically because
they tapped an amount preset, which counts as an outside-click
and dismisses the popover — the Send button is disabled with no
visible reason. Surface an actionable hint that re-opens the
dropdown so the donor doesn't have to guess that they're meant
to tap the recipient input again.
Gated on `hasOpenedForQuery` so the hint doesn't flash for one
paint frame between mount and the auto-open effect on prefilled
inputs (campaign donate flow). */}
{hasOpenedForQuery && !popoverOpen && totalItems > 0 && (
<button
type="button"
onMouseDown={(e) => e.preventDefault()}
onClick={() => {
setOpen(true);
inputRef.current?.focus();
}}
className="flex items-center gap-1.5 text-xs text-amber-600 dark:text-amber-500 hover:text-amber-700 dark:hover:text-amber-400 motion-safe:transition-colors text-left"
>
<AlertTriangle className="size-3.5 shrink-0" />
<span>{t('walletSend.recipient.choosePaymentMethod')}</span>
</button>
)}
<QrScannerDialog
isOpen={scannerOpen}
onClose={() => setScannerOpen(false)}
onScan={handleScan}
title={t('walletSend.recipient.scan')}
/>
</div>
);
}
// ---------------------------------------------------------------------------
// Dropdown rows
// ---------------------------------------------------------------------------
/** Truncate long addresses with an ellipsis so they don't overflow the row. */
function truncateAddress(address: string): string {
return address.length > 28
? `${address.slice(0, 14)}${address.slice(-10)}`
: address;
}
function BtcAddressRow({
address,
onClick,
}: {
address: string;
onClick: (address: string) => void;
}) {
const { t } = useTranslation();
return (
<button
type="button"
role="option"
aria-selected={false}
onClick={() => onClick(address)}
// Prevent the input from blurring on mousedown — otherwise the popover
// closes before `onClick` fires and the row never resolves.
onMouseDown={(e) => e.preventDefault()}
className="w-full flex items-center gap-3 px-3 py-2 text-left transition-colors cursor-pointer hover:bg-secondary/60"
>
<div className="size-9 shrink-0 rounded-full bg-orange-500/10 flex items-center justify-center">
<Bitcoin className="size-4 text-orange-500" />
</div>
<div className="flex-1 min-w-0">
<div className="font-semibold text-sm truncate">
{t('walletSend.recipient.sendToOnchain')}
</div>
<div className="text-xs text-muted-foreground truncate font-mono">
{truncateAddress(address)}
</div>
</div>
</button>
);
}
/**
* Dropdown row for BIP-352 silent payment addresses. We give it a distinct
* label and icon (privacy eye-off) so the user can tell at a glance that
* this is a static, unlinkable address rather than a regular Bitcoin
* scriptPubKey — the privacy story is materially different.
*/
function SpAddressRow({
address,
onClick,
}: {
address: string;
onClick: (address: string) => void;
}) {
const { t } = useTranslation();
return (
<button
type="button"
role="option"
aria-selected={false}
onClick={() => onClick(address)}
onMouseDown={(e) => e.preventDefault()}
className="w-full flex items-center gap-3 px-3 py-2 text-left transition-colors cursor-pointer hover:bg-secondary/60"
>
<div className="size-9 shrink-0 rounded-full bg-violet-500/10 flex items-center justify-center">
<EyeOff className="size-4 text-violet-500" />
</div>
<div className="flex-1 min-w-0">
<div className="font-semibold text-sm truncate">
{t('walletSend.recipient.sendToSilentPayment')}
</div>
<div className="text-xs text-muted-foreground truncate font-mono">
{truncateAddress(address)}
</div>
</div>
</button>
);
}
// ---------------------------------------------------------------------------
// Selected recipient chip
// ---------------------------------------------------------------------------
/**
* Compact panel that replaces the input once a recipient has been picked.
* Renders a coloured icon (orange Bitcoin / violet EyeOff for SP), the kind
* label, a truncated monospace address, and an X button that clears the
* selection and returns the user to the input view.
*/
function SelectedRecipientChip({
value,
onClear,
}: {
value: ResolvedRecipient;
onClear: () => void;
}) {
const { t } = useTranslation();
const { address, kind } = value;
const displayName =
kind === 'sp'
? t('walletSend.recipient.silentPayment')
: t('walletSend.recipient.bitcoinAddress');
const subtitle = truncateAddress(address);
return (
<div className="flex items-center gap-3 rounded-2xl border border-border bg-muted/40 pl-2 pr-2 py-1.5 w-full min-w-0 max-w-full">
{kind === 'sp' ? (
<div className="size-9 shrink-0 rounded-full bg-violet-500/10 flex items-center justify-center">
<EyeOff className="size-4 text-violet-500" />
</div>
) : (
<div className="size-9 shrink-0 rounded-full bg-orange-500/10 flex items-center justify-center">
<Bitcoin className="size-4 text-orange-500" />
</div>
)}
<div className="flex-1 min-w-0 overflow-hidden">
<div className="text-[11px] text-muted-foreground leading-tight">
{t('walletSend.recipient.toLabel')}
</div>
<div className="text-sm font-medium truncate">{displayName}</div>
<div className="text-xs text-muted-foreground truncate font-mono">
{subtitle}
</div>
</div>
<button
type="button"
onClick={onClear}
aria-label={t('walletSend.recipient.clear')}
className="p-1.5 rounded-full text-muted-foreground hover:text-foreground hover:bg-secondary/60 transition-colors shrink-0"
>
<X className="size-4" />
</button>
</div>
);
}
+197
View File
@@ -0,0 +1,197 @@
import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { AlertTriangle } from 'lucide-react';
import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
import { Button } from '@/components/ui/button';
import {
getUniqueBitcoinFeeSpeeds,
type BitcoinFeeRates,
type BitcoinFeeSpeed,
} from '@/lib/bitcoinFeeSpeed';
import {
isFeeRecoverable,
type BroadcastErrorKind,
} from '@/lib/bitcoinBroadcastError';
interface BroadcastErrorAlertProps {
/** Classifier output from {@link classifyBroadcastError}. */
error: BroadcastErrorKind;
/** Currently-resolved sat/vB rate, used to decide whether bump can do anything. */
currentFeeRate: number | undefined;
/** Currently-selected fee tier. */
feeSpeed: BitcoinFeeSpeed;
/** Loaded fee rates, used to compute the de-duped preset tier list. */
feeRates: BitcoinFeeRates | undefined;
/** Whether the underlying mutation is in flight (disables actions). */
isPending: boolean;
/** Bump-fee recovery action. */
onBumpFee: () => void;
/** Plain retry recovery action (used for `network` failures). */
onRetry: () => void;
/**
* When `true` the component knows there's no custom-rate input available
* in the consumer (e.g. {@link DonateDialog}), so we hide the bump button
* and surface a static "you're on the fastest tier" message once the
* user is already on the top preset.
*/
presetTiersOnly?: boolean;
}
/**
* Inline alert rendered above a Bitcoin transaction's Send button when a
* broadcast attempt is rejected. The classifier in
* {@link ../lib/bitcoinBroadcastError} maps the raw relay error onto a
* small enum; each kind gets specific copy and, where recovery is
* possible, an action button.
*
* Action button rules:
*
* - **Fee-recoverable kinds** (`feeTooLow`, `mempoolFull`,
* `rbfReplacementFeeTooLow`) get **Use a higher fee**, which calls
* `onBumpFee`. In `presetTiersOnly` consumers, the button is disabled
* when the user is already on the top preset and a separate hint
* suggests donating from an external wallet.
* - **`network`** gets **Try again**, which re-fires the mutation as-is.
* - **Everything else** gets no action button — the user has to adjust
* amount or recipient (which the consumer's auto-dismiss effect uses
* to clear the alert) before retrying.
*
* The toast surface is intentionally not used for classified failures.
* Toasts auto-dismiss and are visually disconnected from the fee picker;
* an inline alert directly above Send keeps the recovery in the donor's
* line of sight.
*/
export function BroadcastErrorAlert({
error,
currentFeeRate,
feeSpeed,
feeRates,
isPending,
onBumpFee,
onRetry,
presetTiersOnly,
}: BroadcastErrorAlertProps) {
const { t } = useTranslation();
const { title, body } = useMemo(() => {
switch (error.kind) {
case 'feeTooLow':
return {
title: t('walletSend.broadcastError.feeTooLowTitle'),
body: error.minRelayFeeRate
? t('walletSend.broadcastError.feeTooLowBodyWithMin', { min: error.minRelayFeeRate })
: t('walletSend.broadcastError.feeTooLowBody'),
};
case 'rbfReplacementFeeTooLow':
return {
title: t('walletSend.broadcastError.rbfTitle'),
body: t('walletSend.broadcastError.rbfBody'),
};
case 'mempoolFull':
return {
title: t('walletSend.broadcastError.mempoolFullTitle'),
body: t('walletSend.broadcastError.mempoolFullBody'),
};
case 'network':
return {
title: t('walletSend.broadcastError.networkTitle'),
body: t('walletSend.broadcastError.networkBody'),
};
case 'mempoolConflict':
return {
title: t('walletSend.broadcastError.mempoolConflictTitle'),
body: t('walletSend.broadcastError.mempoolConflictBody'),
};
case 'tooLongChain':
return {
title: t('walletSend.broadcastError.tooLongChainTitle'),
body: t('walletSend.broadcastError.tooLongChainBody'),
};
case 'badInputs':
return {
title: t('walletSend.broadcastError.badInputsTitle'),
body: t('walletSend.broadcastError.badInputsBody'),
};
case 'absurdlyHighFee':
return {
title: t('walletSend.broadcastError.absurdlyHighFeeTitle'),
body: t('walletSend.broadcastError.absurdlyHighFeeBody'),
};
case 'unknown':
default:
return {
title: t('walletSend.broadcastError.unknownTitle'),
// Fall back to the raw bitcoind / framing message so the donor
// (or a support thread) has something concrete to act on. Empty
// when the classifier had no message to preserve.
body: 'raw' in error && error.raw ? error.raw : '',
};
}
}, [error, t]);
// Decide whether the bump-fee CTA is actually useful here. For consumers
// that ship a custom-rate input (the HD wallet flow), the bump is always
// useful — we either jump to a faster preset or escalate to a custom
// rate seeded from the error. For preset-only consumers (the donate
// flow), the button only makes sense while a faster preset exists; once
// the user is on the top preset they need to switch to an external
// wallet.
const uniquePresets = feeRates ? getUniqueBitcoinFeeSpeeds(feeRates) : [];
const isCustom = feeSpeed === 'custom';
const isOnTopPreset =
!isCustom
&& uniquePresets.length > 0
// Cast through the preset union to avoid `.indexOf` narrowing
// `feeSpeed` for the rest of the function body.
&& uniquePresets.indexOf(feeSpeed as Exclude<BitcoinFeeSpeed, 'custom'>) === 0;
const haveFeeHint =
error.kind === 'feeTooLow'
&& !!(error.minRelayFeeRate || error.actualFeeRate);
const showBumpFee = isFeeRecoverable(error.kind) && !(presetTiersOnly && isOnTopPreset);
const showAtMaxHint = presetTiersOnly && isOnTopPreset && isFeeRecoverable(error.kind);
const canBumpUsefully =
!isOnTopPreset || haveFeeHint || isCustom || !!currentFeeRate;
const showRetry = error.kind === 'network';
return (
<Alert variant="destructive" className="py-2.5">
<AlertTriangle className="size-4" />
<AlertTitle className="text-sm">{title}</AlertTitle>
{body && <AlertDescription className="text-xs mt-1">{body}</AlertDescription>}
{showAtMaxHint && (
<AlertDescription className="text-xs mt-1 font-medium">
{t('walletSend.broadcastError.atMaxFeeTier')}
</AlertDescription>
)}
{(showBumpFee || showRetry) && (
<div className="mt-2 flex flex-wrap gap-2">
{showBumpFee && (
<Button
type="button"
size="sm"
variant="outline"
onClick={onBumpFee}
disabled={isPending || !canBumpUsefully}
>
{t('walletSend.broadcastError.useHigherFee')}
</Button>
)}
{showRetry && (
<Button
type="button"
size="sm"
variant="outline"
onClick={onRetry}
disabled={isPending}
>
{t('walletSend.broadcastError.tryAgain')}
</Button>
)}
</div>
)}
</Alert>
);
}
@@ -504,6 +504,7 @@ export function CalendarEventDetailPage({ event }: { event: NostrEvent }) {
<PostActionBar
event={event}
replyLabel={t('calendarEvents.detail.comment')}
hideZap
showShareInSidebar
onReply={() => setReplyOpen(true)}
onMore={() => setMoreMenuOpen(true)}

Some files were not shown because too many files have changed in this diff Show More