chore: rename package identifier from com.example.elcaju to me.elcaju

fix: add HTTP polling fallback for mint quote payment detection

README.md

@@ -1,6 +1,6 @@
 ## ElCaju 🥜
 
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/Forte11Cuba/elcaju)   
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/Forte11Cuba/elcaju)
   *Ask questions about this project using DeepWiki AI*
 
 <p align="center">
@@ -28,7 +28,7 @@
 
 ---
 
-## 📱 About ElCaju
+## About ElCaju
 
 **ElCaju** is a [Cashu](https://cashu.space) wallet (ecash on Bitcoin) with Cuban identity, brother of [LaChispa](https://github.com/lachispame/) (Lightning). Designed to offer privacy, offline transactions, and a warm tropical experience.
 
@@ -41,23 +41,31 @@ Cashu is an ecash protocol that enables Bitcoin transactions with maximum privac
 
 ---
 
-## ✨ Features
+## Features
 
 | Feature | Description |
 |---------|-------------|
-| 🔐 **Total Privacy** | Fungible ecash tokens, no traceable history |
-| 📴 **Works Offline** | Store and share tokens without internet |
-| ⚡ **Lightning Bridge** | Deposit and withdraw sats via Lightning Network |
-| 🏦 **Multi-Mint** | Connect to multiple Cashu mints simultaneously |
-| 💱 **Multi-Unit** | Support for sat, USD, EUR and more |
-| 🔑 **Your Seed, Your Money** | Backup with 12 words (BIP39) |
-| 🔒 **Optional PIN** | Protect access to your wallet |
-| 🌐 **Bilingual** | Spanish and English |
-| 🎉 **Friendly UX** | Visual effects and confetti when receiving funds |
+| **Total Privacy** | Fungible ecash tokens, no traceable history |
+| **Works Offline** | Store, create, and share tokens without internet |
+| **Lightning Bridge** | Deposit and withdraw sats via Lightning Network |
+| **Multi-Mint** | Connect to unlimited Cashu mints simultaneously |
+| **Multi-Unit** | Support for sat, USD, EUR, and any unit offered by mints |
+| **P2PK (NUT-10)** | Lock tokens to a Nostr public key — only the recipient can claim |
+| **Token Recovery (NUT-13)** | Restore tokens from any mint using your seed phrase |
+| **NFC Transfers** | Share tokens via NFC — includes Host Card Emulation (HCE) |
+| **Animated QR** | UR-format multi-frame QR codes for large tokens |
+| **Peanut Emoji** | Encode tokens as emoji (compatible with cashu.me) |
+| **Transaction History** | Full history with filters: Ecash, Lightning, Pending |
+| **Pending Tokens** | Save tokens to claim later (up to 50, 30-day expiry) |
+| **BTC Price** | Live price via Yadio API with fiat conversion |
+| **Your Seed, Your Money** | Backup with 12 words (BIP39) |
+| **Optional PIN** | 4-digit PIN to protect wallet access |
+| **11 Languages** | ES, EN, PT, FR, RU, DE, IT, KO, ZH, JA, SW |
+| **Friendly UX** | Confetti celebrations when receiving funds |
 
 ---
 
-## 🚀 Screenshots
+## Screenshots
 
 <p align="center">
   <img src="assets/img/Captura1.png" width="180"/>
@@ -69,35 +77,42 @@ Cashu is an ecash protocol that enables Bitcoin transactions with maximum privac
 
 ---
 
-## 🔧 Technologies
+## Technologies
 
 ### Frontend
 - **Flutter 3.27+**: Cross-platform framework
-- **Dart**: Programming language
+- **Dart 3.11+**: Programming language
 - **Provider**: State management
-- **QR Flutter**: QR code generation
+- **QR Flutter + Mobile Scanner**: QR generation and scanning
 
 ### Backend & Core
-- **[cdk-flutter](https://github.com/cashubtc/cdk_flutter)**: Cashu Development Kit (Rust FFI)
+- **elcaju_core**: Internal Rust library via [flutter_rust_bridge](https://github.com/fzyzcjy/flutter_rust_bridge) v2.11.1 (FFI)
+- **[CDK](https://github.com/cashubtc/cdk) 0.15.1**: Cashu Development Kit (wallet, SQLite, HTTP client, signatory)
 - **SQLite**: Local persistence via cdk-sqlite
-- **Flutter Secure Storage**: Secure storage for seed and PIN
+- **Flutter Secure Storage**: Encrypted storage for seed and PIN
 
 ### Protocols
-- **Cashu**: NUT-00 to NUT-13 (ecash protocol)
+- **Cashu**: NUT-00, 04, 05, 06, 07, 09, 10 (P2PK), 13 (restore)
 - **Lightning Network**: Deposits and withdrawals via BOLT11
-- **BIP39**: Seed phrase generation
+- **BIP39 / BIP32**: Seed phrase generation and key derivation
+- **NIP-06**: Nostr key derivation from mnemonic for P2PK
+
+### Native
+- **NFC Manager + HCE**: Phone-to-phone token transfers
+- **Android NDK 27.0**: Multi-architecture native compilation
+- **Cargokit**: Automated Rust build integration
 
 ---
 
-## 📦 Installation
+## Installation
 
 ### Prerequisites
 
 - Flutter SDK (>=3.27.0)
-- Dart SDK (>=3.6.0)
+- Dart SDK (>=3.11.0)
 - Android Studio with Android SDK
-- Android NDK 26.3+ (install via Android Studio > SDK Manager > SDK Tools)
-- Rust toolchain (>=1.85.0)
+- Android NDK 27.0+ (install via Android Studio > SDK Manager > SDK Tools)
+- Rust toolchain (edition 2024; rustc >= 1.85.0)
 
 ### Clone the Repository
 
@@ -118,7 +133,7 @@ flutter pub get
 # Install Rust if not already installed
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 
-# Update to latest stable (requires >= 1.85.0)
+# Update to latest stable
 rustup update stable
 
 # Install Android targets
@@ -137,61 +152,39 @@ linker = "gcc"
 rustflags = ["-C", "link-arg=-fuse-ld=bfd"]
 
 [target.aarch64-linux-android]
-linker = "/path/to/Android/Sdk/ndk/26.3.11579264/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
+linker = "/path/to/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
 
 [target.armv7-linux-androideabi]
-linker = "/path/to/Android/Sdk/ndk/26.3.11579264/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
+linker = "/path/to/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
 
 [target.x86_64-linux-android]
-linker = "/path/to/Android/Sdk/ndk/26.3.11579264/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang"
+linker = "/path/to/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang"
 
 [env]
-CC_armv7-linux-androideabi = "/path/to/Android/Sdk/ndk/26.3.11579264/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
-AR_armv7-linux-androideabi = "/path/to/Android/Sdk/ndk/26.3.11579264/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
-CC_x86_64-linux-android = "/path/to/Android/Sdk/ndk/26.3.11579264/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang"
-AR_x86_64-linux-android = "/path/to/Android/Sdk/ndk/26.3.11579264/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
-CC_aarch64-linux-android = "/path/to/Android/Sdk/ndk/26.3.11579264/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
-AR_aarch64-linux-android = "/path/to/Android/Sdk/ndk/26.3.11579264/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
+CC_armv7-linux-androideabi = "/path/to/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
+AR_armv7-linux-androideabi = "/path/to/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
+CC_x86_64-linux-android = "/path/to/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang"
+AR_x86_64-linux-android = "/path/to/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
+CC_aarch64-linux-android = "/path/to/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
+AR_aarch64-linux-android = "/path/to/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
 ```
 
 > **Note**: Replace `/path/to/Android/Sdk` with your actual Android SDK path (usually `~/Android/Sdk` on Linux or `~/Library/Android/sdk` on macOS).
 
-### Compile Native Libraries
-
-The cdk_flutter native libraries must be compiled manually:
-
-```bash
-# Navigate to cdk_flutter rust directory
-cd ~/.pub-cache/git/cdk_flutter-*/rust
-
-# Build for each architecture
-cargo build --release --target aarch64-linux-android
-cargo build --release --target armv7-linux-androideabi
-cargo build --release --target x86_64-linux-android
-
-# Copy libraries to project
-mkdir -p /path/to/elcaju/android/app/src/main/jniLibs/{arm64-v8a,armeabi-v7a,x86_64}
-
-cp target/aarch64-linux-android/release/libcdk_flutter.so \
-   /path/to/elcaju/android/app/src/main/jniLibs/arm64-v8a/
-
-cp target/armv7-linux-androideabi/release/libcdk_flutter.so \
-   /path/to/elcaju/android/app/src/main/jniLibs/armeabi-v7a/
-
-cp target/x86_64-linux-android/release/libcdk_flutter.so \
-   /path/to/elcaju/android/app/src/main/jniLibs/x86_64/
-```
-
 ### Run in Development
 
+The Rust library compiles automatically via Cargokit during `flutter run`:
+
 ```bash
 flutter run
 ```
 
+> **Note**: The first build will take several minutes while Rust compiles. Subsequent builds are incremental.
+
 ### Build for Production
 
 ```bash
-# Android APK (includes all architectures, ~55MB)
+# Android APK (includes all architectures)
 flutter build apk --release
 
 # Android App Bundle (recommended for Play Store)
@@ -203,100 +196,123 @@ flutter build appbundle --release
 For faster builds targeting only modern devices:
 
 ```bash
-# Build only arm64 library
-cargo build --release --target aarch64-linux-android
-
-# Copy to project
-cp target/aarch64-linux-android/release/libcdk_flutter.so \
-   android/app/src/main/jniLibs/arm64-v8a/
-
-# Build APK (~40MB)
-flutter build apk --release
+flutter build apk --release --target-platform android-arm64
 ```
 
 ---
 
-## 🏗️ Architecture
+## Architecture
 
-```
+```text
 ┌─────────────────────────────────────────┐
-│          Flutter UI (Dart)              │
-│   Provider + Streams + Intl             │
+│          Flutter UI (Dart 3.11+)        │
+│   Provider + Streams + Intl (11 langs)  │
 ├─────────────────────────────────────────┤
-│     WalletProvider / SettingsProvider   │
-│   (Multi-unit: Map<mintUrl:unit>)       │
+│     4 Providers: Wallet, Settings,      │
+│       Price (Yadio), P2PK (NIP-06)      │
 ├─────────────────────────────────────────┤
-│          cdk-flutter (FFI)              │
-│      flutter_rust_bridge v2.11.1        │
+│    flutter_rust_bridge v2.11.1 (FFI)    │
 ├─────────────────────────────────────────┤
-│           Rust Core (CDK)               │
-│  Cashu 0.13.4 + SQLite + Bitcoin        │
+│        elcaju_core (Rust interno)       │
+│   CDK 0.15.1 + SQLite + BIP39 + Tokio  │
 └─────────────────────────────────────────┘
 ```
 
 ### Project Structure
 
-```
+```text
 elcaju/
 ├── lib/
-│   ├── main.dart                 # Entry point
+│   ├── main.dart                  # Entry point (RustLib.init + Providers)
 │   ├── core/
-│   │   ├── constants/            # Colors, dimensions
-│   │   ├── theme/                # App theme
-│   │   └── utils/                # Formatters, validators
+│   │   ├── constants/             # Colors, dimensions
+│   │   ├── models/                # Proof model
+│   │   ├── services/              # LNURL, NFC, price, proofs
+│   │   ├── theme/                 # Material 3 dark theme
+│   │   └── utils/                 # Formatters, parsers, nostr, p2pk, peanut codec
+│   ├── data/                      # Pending tokens, transaction metadata storage
+│   ├── models/                    # P2PK key model (npub/nsec)
 │   ├── providers/
-│   │   ├── wallet_provider.dart  # Wallet logic
-│   │   └── settings_provider.dart# Preferences and PIN
+│   │   ├── wallet_provider.dart   # Multi-mint, multi-unit wallet logic
+│   │   ├── settings_provider.dart # Preferences, PIN, seed
+│   │   ├── price_provider.dart    # BTC price cache (Yadio API)
+│   │   └── p2pk_provider.dart     # Nostr key management (NIP-06)
 │   ├── screens/
-│   │   ├── 1_splash/             # Loading screen
-│   │   ├── 2_onboarding/         # Create/restore wallet
-│   │   ├── 3_home/               # Main screen
-│   │   ├── 4_receive/            # Receive tokens
-│   │   ├── 5_send/               # Send tokens
-│   │   ├── 6_mint/               # Deposit via Lightning
-│   │   ├── 7_melt/               # Withdraw to Lightning
-│   │   └── 8_settings/           # Settings
+│   │   ├── 1_splash/              # Loading & initialization
+│   │   ├── 2_onboarding/          # Create / restore / backup seed
+│   │   ├── 3_home/                # Main dashboard
+│   │   ├── 4_receive/             # Receive tokens (paste, QR, NFC)
+│   │   ├── 5_send/                # Send tokens + offline mode + share
+│   │   ├── 6_mint/                # Lightning deposit
+│   │   ├── 7_melt/                # Lightning withdrawal
+│   │   ├── 8_settings/            # Settings, mints, P2PK keys, language
+│   │   ├── 9_history/             # Transaction history with filters
+│   │   └── 10_scanner/            # QR code scanner
+│   ├── src/rust/                  # FFI bridge (auto-generated + API bindings)
 │   ├── widgets/
-│   │   ├── common/               # Buttons, cards, etc.
-│   │   └── effects/              # Confetti and animations
-│   └── l10n/                     # Translations ES/EN
-└── assets/
-    └── img/                      # Logo and assets
+│   │   ├── common/                # Buttons, cards, numpad, backgrounds
+│   │   ├── effects/               # Confetti animation
+│   │   ├── proof/                 # Proof selector (offline send)
+│   │   └── scanner/               # QR scanner widget
+│   └── l10n/                      # 11 languages (354 translation keys)
+├── rust/
+│   ├── Cargo.toml                 # elcaju_core: CDK 0.15.1, flutter_rust_bridge 2.11.1
+│   └── src/api/                   # wallet, token, keys, mint_info, error
+├── rust_builder/                  # Cargokit integration (auto Rust compilation)
+├── android/                       # Android config (NDK 27.0, NFC HCE service)
+└── assets/img/                    # Logo and screenshots
 ```
 
 ---
 
-## 🔐 Security
+## Cashu NUT Support
+
+| NUT | Name | Status |
+|-----|------|--------|
+| NUT-00 | Cashu Protocol | Supported |
+| NUT-04 | Mint (Lightning deposit) | Supported |
+| NUT-05 | Melt (Lightning withdrawal) | Supported |
+| NUT-06 | Token swap | Supported |
+| NUT-07 | Spend conditions (witness) | Supported |
+| NUT-09 | Token restore | Supported |
+| NUT-10 | P2PK (locked tokens) | Supported |
+| NUT-13 | Deterministic secrets (recovery) | Supported |
+
+---
+
+## Security
 
 | Feature | Implementation |
 |---------|----------------|
-| **Seed Phrase** | Stored with Flutter Secure Storage (native encryption) |
-| **PIN** | Secure hash, local verification |
-| **Local Data** | SQLite with proofs encrypted by Cashu protocol |
+| **Seed Phrase** | BIP39 12 words, stored with Flutter Secure Storage (native encryption) |
+| **Key Derivation** | BIP32 + NIP-06 (m/44'/1237'/0'/0/0) for P2PK keys |
+| **PIN** | 4-digit PIN with secure hash, local verification |
+| **Local Data** | SQLite with proofs managed by CDK |
+| **P2PK Keys** | Primary (from seed) + up to 10 imported keys, all encrypted |
 | **No Tracking** | We don't collect user data |
 | **Open Source** | 100% auditable |
 
 ### Important
 
-> ⚠️ **Backup your seed phrase (12 words)**. Without it, you won't be able to recover your funds if you lose your device.
+> **Backup your seed phrase (12 words)**. Without it, you won't be able to recover your funds if you lose your device.
 
 ---
 
-## 📱 Compatibility
+## Compatibility
 
 | Platform | Status | Minimum Version |
 |----------|--------|-----------------|
-| ✅ Android | Supported | API 24 (Android 7.0) |
-| 🚧 iOS | Coming soon | iOS 12.0+ |
-| 🚧 Web | Coming soon | - |
+| Android | Supported | API 24 (Android 7.0) |
+| iOS | Coming soon | iOS 11.0+ |
+| Web | Coming soon | - |
 
 ---
 
-## 🌐 Default Mint
+## Default Mint
 
 ElCaju comes preconfigured with the Cuba Bitcoin mint:
 
-```
+```text
 https://mint.cubabitcoin.org
 ```
 
@@ -304,7 +320,16 @@ You can add other Cashu mints from the settings.
 
 ---
 
-## 🤝 Contributing
+## CI/CD
+
+Automated releases via GitHub Actions (`.github/workflows/release.yml`):
+- Triggers on Git tags (`v*`)
+- Builds multi-architecture APKs (arm64, armv7, x86_64) + universal APK
+- Creates GitHub releases automatically
+
+---
+
+## Contributing
 
 Contributions are welcome!
 
@@ -324,16 +349,17 @@ Open an [issue](https://github.com/Forte11Cuba/elcaju/issues) with:
 
 ---
 
-## 📄 License
+## License
 
 This project is under the MIT License - see the [LICENSE](LICENSE) file for more details.
 
 ---
 
-## 🙏 Credits
+## Credits
 
 - **[Cashu](https://cashu.space)** - Ecash protocol
-- **[cdk-flutter](https://github.com/cashubtc/cdk_flutter)** - Cashu Development Kit
+- **[CDK](https://github.com/cashubtc/cdk)** - Cashu Development Kit
+- **[flutter_rust_bridge](https://github.com/fzyzcjy/flutter_rust_bridge)** - Rust-Dart FFI
 - **[Cashu4Community](https://cashu4community.xyz)** - Global Cashu community
 - **[Cuba Bitcoin](https://cubabitcoin.org)** - Cuban Bitcoin community
 

ios/Runner.xcodeproj/project.pbxproj

@@ -368,7 +368,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.elcaju;
+				PRODUCT_BUNDLE_IDENTIFIER = me.elcaju;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -384,7 +384,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.elcaju.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = me.elcaju.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -401,7 +401,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.elcaju.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = me.elcaju.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -416,7 +416,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.elcaju.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = me.elcaju.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -547,7 +547,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.elcaju;
+				PRODUCT_BUNDLE_IDENTIFIER = me.elcaju;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -569,7 +569,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.elcaju;
+				PRODUCT_BUNDLE_IDENTIFIER = me.elcaju;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

lib/core/constants/colors.dart

@@ -22,6 +22,7 @@ class AppColors {
   // === ACCENT COLORS ===
   static const Color primaryAction = Color(0xFFE35D33); // Naranja vibrante
   static const Color secondaryAction = Color(0xFFFFB74D); // Amarillo pulpa/Bitcoin
+  static const Color bitcoinOrange = Color(0xFFF7931A); // Bitcoin brand orange
   static const Color success = Color(0xFF00E676); // Verde neón
   static const Color error = Color(0xFFFF5252); // Rojo suave
   static const Color warning = Color(0xFFFFB74D); // Amarillo

lib/core/services/nfc_service.dart

@@ -473,11 +473,13 @@ class NfcService {
     return null;
   }
 
-  /// Check if a string looks like a Cashu token.
+  /// Check if a string looks like a Cashu token or payment request.
   static bool _isCashuToken(String text) {
     final lower = text.toLowerCase().trim();
     return lower.startsWith('cashua') ||
         lower.startsWith('cashub') ||
-        lower.startsWith('creqa');
+        lower.startsWith('creqa') ||
+        lower.startsWith('creqb') ||
+        lower.startsWith('bitcoin:');
   }
 }

lib/core/services/proof_service.dart

@@ -33,7 +33,7 @@ class ProofService {
     final dir = await getApplicationDocumentsDirectory();
     final dbPath = '${dir.path}/elcaju_wallet.sqlite';
 
-    _db = await openDatabase(dbPath);
+    _db = await openDatabase(dbPath, singleInstance: false);
     return _db!;
   }
 

lib/core/utils/bip321_builder.dart

@@ -0,0 +1,20 @@
+/// Builds a BIP-321 unified payment URI.
+///
+/// Format: BITCOIN:?LIGHTNING=LNBC...&CREQ=CREQB1...
+/// All uppercase for optimal QR encoding (alphanumeric mode).
+///
+/// Ref: NUT-26 "BIP-321 Integration" section.
+String buildUnifiedUri({
+  required String creqB,
+  String? bolt11,
+}) {
+  final buffer = StringBuffer('bitcoin:?');
+  if (bolt11 != null) {
+    buffer.write('lightning=');
+    buffer.write(bolt11.toUpperCase());
+    buffer.write('&');
+  }
+  buffer.write('creq=');
+  buffer.write(creqB.toUpperCase());
+  return buffer.toString();
+}

lib/core/utils/incoming_data_parser.dart

@@ -15,7 +15,7 @@ enum IncomingDataType {
   cashuToken,       // cashuA... / cashuB...
   lightningInvoice, // lnbc... / lntb... / lnbcrt...
   mintUrl,          // https://...
-  paymentRequest,   // creqA... (post-MVP, Cashu payment request)
+  paymentRequest,   // creqA/creqB/bitcoin:?creq= (NUT-18/26 payment request)
   unknown,
 }
 
@@ -103,8 +103,31 @@ class IncomingDataParser {
       );
     }
 
-    // Payment Request (creqA...)
-    if (lower.startsWith('creqa')) {
+    // BIP-321 unified URI: bitcoin:?lightning=...&creq=...
+    // Detect as paymentRequest but also extract the lightning invoice
+    if (lower.startsWith('bitcoin:')) {
+      final bolt11 = _extractBip321Param(trimmed, 'lightning');
+      final creq = _extractBip321Param(trimmed, 'creq');
+
+      if (creq != null) {
+        return ParsedData(
+          type: IncomingDataType.paymentRequest,
+          raw: trimmed,
+          invoiceBolt11: bolt11,
+        );
+      }
+      // bitcoin: URI with only lightning= (no creq)
+      if (bolt11 != null) {
+        return ParsedData(
+          type: IncomingDataType.lightningInvoice,
+          raw: trimmed,
+          invoiceBolt11: bolt11,
+        );
+      }
+    }
+
+    // Payment Request: creqA (NUT-18), creqB/CREQB1 (NUT-26)
+    if (lower.startsWith('creqa') || lower.startsWith('creqb')) {
       return ParsedData(
         type: IncomingDataType.paymentRequest,
         raw: trimmed,
@@ -193,7 +216,35 @@ class IncomingDataParser {
       case ScanMode.cashuOnly:
         return data.type == IncomingDataType.cashuToken;
       case ScanMode.invoiceOnly:
-        return data.type == IncomingDataType.lightningInvoice;
+        // Accept pure invoices and BIP-321 URIs that contain a lightning invoice
+        return data.type == IncomingDataType.lightningInvoice ||
+            (data.type == IncomingDataType.paymentRequest &&
+                data.invoiceBolt11 != null);
     }
   }
+
+  /// Extract a query parameter value from a BIP-321 URI.
+  /// Case-insensitive key matching, handles percent-encoding.
+  static String? _extractBip321Param(String uri, String key) {
+    final qIndex = uri.indexOf('?');
+    if (qIndex < 0) return null;
+    final query = uri.substring(qIndex + 1);
+    for (final param in query.split('&')) {
+      final eqIndex = param.indexOf('=');
+      if (eqIndex < 0) continue;
+      final k = param.substring(0, eqIndex);
+      if (k.toLowerCase() == key.toLowerCase()) {
+        final rawValue = param.substring(eqIndex + 1);
+        if (rawValue.isEmpty) continue;
+        try {
+          final value = Uri.decodeComponent(rawValue);
+          if (value.isEmpty) continue;
+          return value;
+        } on ArgumentError {
+          continue;
+        }
+      }
+    }
+    return null;
+  }
 }

lib/l10n/app_de.arb

@@ -502,7 +502,22 @@
   "scanLightningInvoiceHint": "Scanne eine Lightning Rechnung (lnbc...)",
   "addMintQuestion": "Diesen Mint hinzufügen?",
   "cameraPermissionDenied": "Kamera-Berechtigung verweigert",
-  "paymentRequestNotSupported": "Zahlungsanfragen werden noch nicht unterstützt",
+  "paymentRequestTitle": "Zahlungsanfrage",
+  "paymentRequestFrom": "Anfrage von",
+  "paymentRequestAmount": "Angeforderter Betrag",
+  "paymentRequestDescription": "Beschreibung",
+  "paymentRequestMints": "Akzeptierte Mints",
+  "paymentRequestAnyMint": "Jeder Mint",
+  "paymentRequestPay": "Bezahlen",
+  "paymentRequestPaying": "Bezahle...",
+  "paymentRequestSuccess": "Zahlung erfolgreich gesendet",
+  "paymentRequestNoTransport": "Diese Anfrage hat keine konfigurierte Zustellmethode",
+  "paymentRequestTransport": "Transport",
+  "paymentRequestMintNotAccepted": "Dein aktiver Mint ist nicht in der Liste der akzeptierten Mints",
+  "paymentRequestUnitMismatch": "Inkompatible Einheit: Anfrage erfordert {unit}",
+  "paymentRequestInsufficientBalance": "Unzureichendes Guthaben",
+  "paymentRequestErrorParsing": "Fehler beim Lesen der Zahlungsanfrage",
+
   "p2pkTitle": "P2PK-Schlüssel",
   "p2pkSettingsDescription": "Gesperrtes ecash empfangen",
   "p2pkExperimental": "P2PK ist experimentell. Mit Vorsicht verwenden.",
@@ -534,5 +549,15 @@
   "p2pkErrorInvalidNsec": "Ungültiger nsec",
   "p2pkErrorKeyAlreadyExists": "Dieser Schlüssel existiert bereits",
   "p2pkErrorKeyNotFound": "Schlüssel nicht gefunden",
-  "p2pkErrorCannotDeletePrimary": "Primärschlüssel kann nicht gelöscht werden"
+  "p2pkErrorCannotDeletePrimary": "Primärschlüssel kann nicht gelöscht werden",
+
+  "request": "Anfordern",
+  "requestPayment": "Zahlung anfordern",
+  "requestPaymentDescription": "Einheitliche Zahlungsanforderung erstellen",
+  "generateRequest": "Anforderung erstellen",
+  "generatingRequest": "Anforderung wird erstellt...",
+  "requestPaymentReceived": "Zahlung erhalten",
+  "requestDescriptionHint": "Beschreibung (optional)",
+  "universal": "Universal",
+  "copiedToClipboard": "In die Zwischenablage kopiert"
 }

lib/l10n/app_en.arb

@@ -390,7 +390,26 @@
   "scanLightningInvoiceHint": "Scan a Lightning invoice (lnbc...)",
   "addMintQuestion": "Add this mint?",
   "cameraPermissionDenied": "Camera permission denied",
-  "paymentRequestNotSupported": "Payment requests are not yet supported",
+  "paymentRequestTitle": "Payment Request",
+  "paymentRequestFrom": "Request from",
+  "paymentRequestAmount": "Requested amount",
+  "paymentRequestDescription": "Description",
+  "paymentRequestMints": "Accepted mints",
+  "paymentRequestAnyMint": "Any mint",
+  "paymentRequestPay": "Pay",
+  "paymentRequestPaying": "Paying...",
+  "paymentRequestSuccess": "Payment sent successfully",
+  "paymentRequestNoTransport": "This request has no delivery method configured",
+  "paymentRequestTransport": "Transport",
+  "paymentRequestMintNotAccepted": "Your active mint is not in the list of accepted mints",
+  "paymentRequestUnitMismatch": "Incompatible unit: request requires {unit}",
+  "@paymentRequestUnitMismatch": {
+    "placeholders": {
+      "unit": { "type": "String" }
+    }
+  },
+  "paymentRequestInsufficientBalance": "Insufficient balance",
+  "paymentRequestErrorParsing": "Error reading payment request",
 
   "p2pkTitle": "P2PK Keys",
   "p2pkSettingsDescription": "Receive locked ecash",
@@ -423,5 +442,15 @@
   "p2pkErrorInvalidNsec": "Invalid nsec",
   "p2pkErrorKeyAlreadyExists": "This key already exists",
   "p2pkErrorKeyNotFound": "Key not found",
-  "p2pkErrorCannotDeletePrimary": "Cannot delete primary key"
+  "p2pkErrorCannotDeletePrimary": "Cannot delete primary key",
+
+  "request": "Request",
+  "requestPayment": "Request Payment",
+  "requestPaymentDescription": "Generate unified payment request",
+  "generateRequest": "Generate Request",
+  "generatingRequest": "Generating request...",
+  "requestPaymentReceived": "Payment received",
+  "requestDescriptionHint": "Description (optional)",
+  "universal": "Universal",
+  "copiedToClipboard": "Copied to clipboard"
 }

lib/l10n/app_es.arb

@@ -510,7 +510,26 @@
   "scanLightningInvoiceHint": "Escanea un invoice Lightning (lnbc...)",
   "addMintQuestion": "¿Agregar este mint?",
   "cameraPermissionDenied": "Permiso de cámara denegado",
-  "paymentRequestNotSupported": "Los payment requests aún no están soportados",
+  "paymentRequestTitle": "Solicitud de pago",
+  "paymentRequestFrom": "Solicitud de",
+  "paymentRequestAmount": "Monto solicitado",
+  "paymentRequestDescription": "Descripción",
+  "paymentRequestMints": "Mints aceptados",
+  "paymentRequestAnyMint": "Cualquier mint",
+  "paymentRequestPay": "Pagar",
+  "paymentRequestPaying": "Pagando...",
+  "paymentRequestSuccess": "Pago enviado correctamente",
+  "paymentRequestNoTransport": "Esta solicitud no tiene método de entrega configurado",
+  "paymentRequestTransport": "Transporte",
+  "paymentRequestMintNotAccepted": "Tu mint activo no está en la lista de mints aceptados",
+  "paymentRequestUnitMismatch": "Unidad incompatible: la solicitud requiere {unit}",
+  "@paymentRequestUnitMismatch": {
+    "placeholders": {
+      "unit": { "type": "String" }
+    }
+  },
+  "paymentRequestInsufficientBalance": "Balance insuficiente",
+  "paymentRequestErrorParsing": "Error al leer la solicitud de pago",
 
   "p2pkTitle": "Claves P2PK",
   "p2pkSettingsDescription": "Recibir ecash bloqueado",
@@ -543,5 +562,15 @@
   "p2pkErrorInvalidNsec": "nsec inválido",
   "p2pkErrorKeyAlreadyExists": "Esta clave ya existe",
   "p2pkErrorKeyNotFound": "Clave no encontrada",
-  "p2pkErrorCannotDeletePrimary": "No se puede eliminar la clave principal"
+  "p2pkErrorCannotDeletePrimary": "No se puede eliminar la clave principal",
+
+  "request": "Solicitar",
+  "requestPayment": "Solicitar pago",
+  "requestPaymentDescription": "Generar solicitud de pago unificada",
+  "generateRequest": "Generar solicitud",
+  "generatingRequest": "Generando solicitud...",
+  "requestPaymentReceived": "Pago recibido",
+  "requestDescriptionHint": "Descripción (opcional)",
+  "universal": "Universal",
+  "copiedToClipboard": "Copiado al portapapeles"
 }

lib/l10n/app_fr.arb

@@ -502,7 +502,22 @@
   "scanLightningInvoiceHint": "Scannez une facture Lightning (lnbc...)",
   "addMintQuestion": "Ajouter ce mint ?",
   "cameraPermissionDenied": "Permission de la caméra refusée",
-  "paymentRequestNotSupported": "Les demandes de paiement ne sont pas encore prises en charge",
+  "paymentRequestTitle": "Demande de paiement",
+  "paymentRequestFrom": "Demande de",
+  "paymentRequestAmount": "Montant demandé",
+  "paymentRequestDescription": "Description",
+  "paymentRequestMints": "Mints acceptés",
+  "paymentRequestAnyMint": "N'importe quel mint",
+  "paymentRequestPay": "Payer",
+  "paymentRequestPaying": "Paiement en cours...",
+  "paymentRequestSuccess": "Paiement envoyé avec succès",
+  "paymentRequestNoTransport": "Cette demande n'a pas de méthode de livraison configurée",
+  "paymentRequestTransport": "Transport",
+  "paymentRequestMintNotAccepted": "Votre mint actif n'est pas dans la liste des mints acceptés",
+  "paymentRequestUnitMismatch": "Unité incompatible : la demande nécessite {unit}",
+  "paymentRequestInsufficientBalance": "Solde insuffisant",
+  "paymentRequestErrorParsing": "Erreur lors de la lecture de la demande de paiement",
+
   "p2pkTitle": "Clés P2PK",
   "p2pkSettingsDescription": "Recevoir ecash verrouillé",
   "p2pkExperimental": "P2PK est expérimental. Utiliser avec prudence.",
@@ -534,5 +549,15 @@
   "p2pkErrorInvalidNsec": "nsec invalide",
   "p2pkErrorKeyAlreadyExists": "Cette clé existe déjà",
   "p2pkErrorKeyNotFound": "Clé non trouvée",
-  "p2pkErrorCannotDeletePrimary": "Impossible de supprimer la clé principale"
+  "p2pkErrorCannotDeletePrimary": "Impossible de supprimer la clé principale",
+
+  "request": "Demander",
+  "requestPayment": "Demander un paiement",
+  "requestPaymentDescription": "Générer une demande de paiement unifiée",
+  "generateRequest": "Générer la demande",
+  "generatingRequest": "Génération en cours...",
+  "requestPaymentReceived": "Paiement reçu",
+  "requestDescriptionHint": "Description (facultatif)",
+  "universal": "Universel",
+  "copiedToClipboard": "Copié dans le presse-papiers"
 }

lib/l10n/app_it.arb

@@ -502,7 +502,22 @@
   "scanLightningInvoiceHint": "Scansiona una fattura Lightning (lnbc...)",
   "addMintQuestion": "Aggiungere questo mint?",
   "cameraPermissionDenied": "Permesso fotocamera negato",
-  "paymentRequestNotSupported": "Le richieste di pagamento non sono ancora supportate",
+  "paymentRequestTitle": "Richiesta di pagamento",
+  "paymentRequestFrom": "Richiesta da",
+  "paymentRequestAmount": "Importo richiesto",
+  "paymentRequestDescription": "Descrizione",
+  "paymentRequestMints": "Mint accettati",
+  "paymentRequestAnyMint": "Qualsiasi mint",
+  "paymentRequestPay": "Paga",
+  "paymentRequestPaying": "Pagamento in corso...",
+  "paymentRequestSuccess": "Pagamento inviato con successo",
+  "paymentRequestNoTransport": "Questa richiesta non ha un metodo di consegna configurato",
+  "paymentRequestTransport": "Trasporto",
+  "paymentRequestMintNotAccepted": "Il tuo mint attivo non è nella lista dei mint accettati",
+  "paymentRequestUnitMismatch": "Unità incompatibile: la richiesta richiede {unit}",
+  "paymentRequestInsufficientBalance": "Saldo insufficiente",
+  "paymentRequestErrorParsing": "Errore nella lettura della richiesta di pagamento",
+
   "p2pkTitle": "Chiavi P2PK",
   "p2pkSettingsDescription": "Ricevi ecash bloccato",
   "p2pkExperimental": "P2PK è sperimentale. Usare con cautela.",
@@ -534,5 +549,15 @@
   "p2pkErrorInvalidNsec": "nsec non valido",
   "p2pkErrorKeyAlreadyExists": "Questa chiave esiste già",
   "p2pkErrorKeyNotFound": "Chiave non trovata",
-  "p2pkErrorCannotDeletePrimary": "Impossibile eliminare la chiave principale"
+  "p2pkErrorCannotDeletePrimary": "Impossibile eliminare la chiave principale",
+
+  "request": "Richiedi",
+  "requestPayment": "Richiedi pagamento",
+  "requestPaymentDescription": "Genera richiesta di pagamento unificata",
+  "generateRequest": "Genera richiesta",
+  "generatingRequest": "Generazione in corso...",
+  "requestPaymentReceived": "Pagamento ricevuto",
+  "requestDescriptionHint": "Descrizione (opzionale)",
+  "universal": "Universale",
+  "copiedToClipboard": "Copiato negli appunti"
 }

lib/l10n/app_ja.arb

@@ -502,7 +502,22 @@
   "scanLightningInvoiceHint": "Lightningインボイスをスキャン（lnbc...）",
   "addMintQuestion": "このMintを追加しますか？",
   "cameraPermissionDenied": "カメラの許可が拒否されました",
-  "paymentRequestNotSupported": "支払いリクエストはまだサポートされていません",
+  "paymentRequestTitle": "支払いリクエスト",
+  "paymentRequestFrom": "リクエスト元",
+  "paymentRequestAmount": "リクエスト金額",
+  "paymentRequestDescription": "説明",
+  "paymentRequestMints": "対応ミント",
+  "paymentRequestAnyMint": "すべてのミント",
+  "paymentRequestPay": "支払う",
+  "paymentRequestPaying": "支払い中...",
+  "paymentRequestSuccess": "支払いが正常に送信されました",
+  "paymentRequestNoTransport": "このリクエストには配信方法が設定されていません",
+  "paymentRequestTransport": "トランスポート",
+  "paymentRequestMintNotAccepted": "アクティブなミントは対応ミントリストにありません",
+  "paymentRequestUnitMismatch": "単位が互換性がありません：リクエストには{unit}が必要です",
+  "paymentRequestInsufficientBalance": "残高不足",
+  "paymentRequestErrorParsing": "支払いリクエストの読み取りエラー",
+
   "p2pkTitle": "P2PK鍵",
   "p2pkSettingsDescription": "ロックされたecashを受け取る",
   "p2pkExperimental": "P2PKは実験的機能です。注意してご使用ください。",
@@ -534,5 +549,15 @@
   "p2pkErrorInvalidNsec": "無効なnsec",
   "p2pkErrorKeyAlreadyExists": "この鍵は既に存在します",
   "p2pkErrorKeyNotFound": "鍵が見つかりません",
-  "p2pkErrorCannotDeletePrimary": "プライマリ鍵は削除できません"
+  "p2pkErrorCannotDeletePrimary": "プライマリ鍵は削除できません",
+
+  "request": "リクエスト",
+  "requestPayment": "支払いをリクエスト",
+  "requestPaymentDescription": "統合支払いリクエストを生成",
+  "generateRequest": "リクエストを生成",
+  "generatingRequest": "生成中...",
+  "requestPaymentReceived": "支払いを受け取りました",
+  "requestDescriptionHint": "説明（任意）",
+  "universal": "ユニバーサル",
+  "copiedToClipboard": "クリップボードにコピーしました"
 }

lib/l10n/app_ko.arb

@@ -502,7 +502,22 @@
   "scanLightningInvoiceHint": "Lightning 인보이스 스캔 (lnbc...)",
   "addMintQuestion": "이 mint를 추가하시겠습니까?",
   "cameraPermissionDenied": "카메라 권한이 거부되었습니다",
-  "paymentRequestNotSupported": "결제 요청은 아직 지원되지 않습니다",
+  "paymentRequestTitle": "결제 요청",
+  "paymentRequestFrom": "요청자",
+  "paymentRequestAmount": "요청 금액",
+  "paymentRequestDescription": "설명",
+  "paymentRequestMints": "허용된 민트",
+  "paymentRequestAnyMint": "모든 민트",
+  "paymentRequestPay": "결제",
+  "paymentRequestPaying": "결제 중...",
+  "paymentRequestSuccess": "결제가 성공적으로 전송되었습니다",
+  "paymentRequestNoTransport": "이 요청에는 전달 방법이 설정되지 않았습니다",
+  "paymentRequestTransport": "전송 방식",
+  "paymentRequestMintNotAccepted": "활성 민트가 허용된 민트 목록에 없습니다",
+  "paymentRequestUnitMismatch": "호환되지 않는 단위: 요청에 {unit}이(가) 필요합니다",
+  "paymentRequestInsufficientBalance": "잔액 부족",
+  "paymentRequestErrorParsing": "결제 요청을 읽는 중 오류 발생",
+
   "p2pkTitle": "P2PK 키",
   "p2pkSettingsDescription": "잠긴 ecash 받기",
   "p2pkExperimental": "P2PK는 실험적 기능입니다. 주의하여 사용하세요.",
@@ -534,5 +549,15 @@
   "p2pkErrorInvalidNsec": "유효하지 않은 nsec",
   "p2pkErrorKeyAlreadyExists": "이 키는 이미 존재합니다",
   "p2pkErrorKeyNotFound": "키를 찾을 수 없습니다",
-  "p2pkErrorCannotDeletePrimary": "기본 키는 삭제할 수 없습니다"
+  "p2pkErrorCannotDeletePrimary": "기본 키는 삭제할 수 없습니다",
+
+  "request": "요청",
+  "requestPayment": "결제 요청",
+  "requestPaymentDescription": "통합 결제 요청 생성",
+  "generateRequest": "요청 생성",
+  "generatingRequest": "생성 중...",
+  "requestPaymentReceived": "결제가 수신되었습니다",
+  "requestDescriptionHint": "설명 (선택사항)",
+  "universal": "유니버설",
+  "copiedToClipboard": "클립보드에 복사되었습니다"
 }

lib/l10n/app_localizations.dart

@@ -2017,11 +2017,95 @@ abstract class L10n {
   /// **'Permiso de cámara denegado'**
   String get cameraPermissionDenied;
 
-  /// No description provided for @paymentRequestNotSupported.
+  /// No description provided for @paymentRequestTitle.
   ///
   /// In es, this message translates to:
-  /// **'Los payment requests aún no están soportados'**
-  String get paymentRequestNotSupported;
+  /// **'Solicitud de pago'**
+  String get paymentRequestTitle;
+
+  /// No description provided for @paymentRequestFrom.
+  ///
+  /// In es, this message translates to:
+  /// **'Solicitud de'**
+  String get paymentRequestFrom;
+
+  /// No description provided for @paymentRequestAmount.
+  ///
+  /// In es, this message translates to:
+  /// **'Monto solicitado'**
+  String get paymentRequestAmount;
+
+  /// No description provided for @paymentRequestDescription.
+  ///
+  /// In es, this message translates to:
+  /// **'Descripción'**
+  String get paymentRequestDescription;
+
+  /// No description provided for @paymentRequestMints.
+  ///
+  /// In es, this message translates to:
+  /// **'Mints aceptados'**
+  String get paymentRequestMints;
+
+  /// No description provided for @paymentRequestAnyMint.
+  ///
+  /// In es, this message translates to:
+  /// **'Cualquier mint'**
+  String get paymentRequestAnyMint;
+
+  /// No description provided for @paymentRequestPay.
+  ///
+  /// In es, this message translates to:
+  /// **'Pagar'**
+  String get paymentRequestPay;
+
+  /// No description provided for @paymentRequestPaying.
+  ///
+  /// In es, this message translates to:
+  /// **'Pagando...'**
+  String get paymentRequestPaying;
+
+  /// No description provided for @paymentRequestSuccess.
+  ///
+  /// In es, this message translates to:
+  /// **'Pago enviado correctamente'**
+  String get paymentRequestSuccess;
+
+  /// No description provided for @paymentRequestNoTransport.
+  ///
+  /// In es, this message translates to:
+  /// **'Esta solicitud no tiene método de entrega configurado'**
+  String get paymentRequestNoTransport;
+
+  /// No description provided for @paymentRequestTransport.
+  ///
+  /// In es, this message translates to:
+  /// **'Transporte'**
+  String get paymentRequestTransport;
+
+  /// No description provided for @paymentRequestMintNotAccepted.
+  ///
+  /// In es, this message translates to:
+  /// **'Tu mint activo no está en la lista de mints aceptados'**
+  String get paymentRequestMintNotAccepted;
+
+  /// No description provided for @paymentRequestUnitMismatch.
+  ///
+  /// In es, this message translates to:
+  /// **'Unidad incompatible: la solicitud requiere {unit}'**
+  String paymentRequestUnitMismatch(String unit);
+
+  /// No description provided for @paymentRequestInsufficientBalance.
+  ///
+  /// In es, this message translates to:
+  /// **'Balance insuficiente'**
+  String get paymentRequestInsufficientBalance;
+
+  /// No description provided for @paymentRequestErrorParsing.
+  ///
+  /// In es, this message translates to:
+  /// **'Error al leer la solicitud de pago'**
+  String get paymentRequestErrorParsing;
 
   /// No description provided for @p2pkTitle.
   ///
@@ -2214,6 +2298,60 @@ abstract class L10n {
   /// In es, this message translates to:
   /// **'No se puede eliminar la clave principal'**
   String get p2pkErrorCannotDeletePrimary;
+
+  /// No description provided for @request.
+  ///
+  /// In es, this message translates to:
+  /// **'Solicitar'**
+  String get request;
+
+  /// No description provided for @requestPayment.
+  ///
+  /// In es, this message translates to:
+  /// **'Solicitar pago'**
+  String get requestPayment;
+
+  /// No description provided for @requestPaymentDescription.
+  ///
+  /// In es, this message translates to:
+  /// **'Generar solicitud de pago unificada'**
+  String get requestPaymentDescription;
+
+  /// No description provided for @generateRequest.
+  ///
+  /// In es, this message translates to:
+  /// **'Generar solicitud'**
+  String get generateRequest;
+
+  /// No description provided for @generatingRequest.
+  ///
+  /// In es, this message translates to:
+  /// **'Generando solicitud...'**
+  String get generatingRequest;
+
+  /// No description provided for @requestPaymentReceived.
+  ///
+  /// In es, this message translates to:
+  /// **'Pago recibido'**
+  String get requestPaymentReceived;
+
+  /// No description provided for @requestDescriptionHint.
+  ///
+  /// In es, this message translates to:
+  /// **'Descripción (opcional)'**
+  String get requestDescriptionHint;
+
+  /// No description provided for @universal.
+  ///
+  /// In es, this message translates to:
+  /// **'Universal'**
+  String get universal;
+
+  /// No description provided for @copiedToClipboard.
+  ///
+  /// In es, this message translates to:
+  /// **'Copiado al portapapeles'**
+  String get copiedToClipboard;
 }
 
 class _L10nDelegate extends LocalizationsDelegate<L10n> {

lib/l10n/app_localizations_de.dart

@@ -1063,8 +1063,54 @@ class L10nDe extends L10n {
   String get cameraPermissionDenied => 'Kamera-Berechtigung verweigert';
 
   @override
-  String get paymentRequestNotSupported =>
-      'Zahlungsanfragen werden noch nicht unterstützt';
+  String get paymentRequestTitle => 'Zahlungsanfrage';
+
+  @override
+  String get paymentRequestFrom => 'Anfrage von';
+
+  @override
+  String get paymentRequestAmount => 'Angeforderter Betrag';
+
+  @override
+  String get paymentRequestDescription => 'Beschreibung';
+
+  @override
+  String get paymentRequestMints => 'Akzeptierte Mints';
+
+  @override
+  String get paymentRequestAnyMint => 'Jeder Mint';
+
+  @override
+  String get paymentRequestPay => 'Bezahlen';
+
+  @override
+  String get paymentRequestPaying => 'Bezahle...';
+
+  @override
+  String get paymentRequestSuccess => 'Zahlung erfolgreich gesendet';
+
+  @override
+  String get paymentRequestNoTransport =>
+      'Diese Anfrage hat keine konfigurierte Zustellmethode';
+
+  @override
+  String get paymentRequestTransport => 'Transport';
+
+  @override
+  String get paymentRequestMintNotAccepted =>
+      'Dein aktiver Mint ist nicht in der Liste der akzeptierten Mints';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return 'Inkompatible Einheit: Anfrage erfordert $unit';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => 'Unzureichendes Guthaben';
+
+  @override
+  String get paymentRequestErrorParsing =>
+      'Fehler beim Lesen der Zahlungsanfrage';
 
   @override
   String get p2pkTitle => 'P2PK-Schlüssel';
@@ -1167,4 +1213,32 @@ class L10nDe extends L10n {
   @override
   String get p2pkErrorCannotDeletePrimary =>
       'Primärschlüssel kann nicht gelöscht werden';
+
+  @override
+  String get request => 'Anfordern';
+
+  @override
+  String get requestPayment => 'Zahlung anfordern';
+
+  @override
+  String get requestPaymentDescription =>
+      'Einheitliche Zahlungsanforderung erstellen';
+
+  @override
+  String get generateRequest => 'Anforderung erstellen';
+
+  @override
+  String get generatingRequest => 'Anforderung wird erstellt...';
+
+  @override
+  String get requestPaymentReceived => 'Zahlung erhalten';
+
+  @override
+  String get requestDescriptionHint => 'Beschreibung (optional)';
+
+  @override
+  String get universal => 'Universal';
+
+  @override
+  String get copiedToClipboard => 'In die Zwischenablage kopiert';
 }

lib/l10n/app_localizations_en.dart

@@ -1050,8 +1050,53 @@ class L10nEn extends L10n {
   String get cameraPermissionDenied => 'Camera permission denied';
 
   @override
-  String get paymentRequestNotSupported =>
-      'Payment requests are not yet supported';
+  String get paymentRequestTitle => 'Payment Request';
+
+  @override
+  String get paymentRequestFrom => 'Request from';
+
+  @override
+  String get paymentRequestAmount => 'Requested amount';
+
+  @override
+  String get paymentRequestDescription => 'Description';
+
+  @override
+  String get paymentRequestMints => 'Accepted mints';
+
+  @override
+  String get paymentRequestAnyMint => 'Any mint';
+
+  @override
+  String get paymentRequestPay => 'Pay';
+
+  @override
+  String get paymentRequestPaying => 'Paying...';
+
+  @override
+  String get paymentRequestSuccess => 'Payment sent successfully';
+
+  @override
+  String get paymentRequestNoTransport =>
+      'This request has no delivery method configured';
+
+  @override
+  String get paymentRequestTransport => 'Transport';
+
+  @override
+  String get paymentRequestMintNotAccepted =>
+      'Your active mint is not in the list of accepted mints';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return 'Incompatible unit: request requires $unit';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => 'Insufficient balance';
+
+  @override
+  String get paymentRequestErrorParsing => 'Error reading payment request';
 
   @override
   String get p2pkTitle => 'P2PK Keys';
@@ -1150,4 +1195,31 @@ class L10nEn extends L10n {
 
   @override
   String get p2pkErrorCannotDeletePrimary => 'Cannot delete primary key';
+
+  @override
+  String get request => 'Request';
+
+  @override
+  String get requestPayment => 'Request Payment';
+
+  @override
+  String get requestPaymentDescription => 'Generate unified payment request';
+
+  @override
+  String get generateRequest => 'Generate Request';
+
+  @override
+  String get generatingRequest => 'Generating request...';
+
+  @override
+  String get requestPaymentReceived => 'Payment received';
+
+  @override
+  String get requestDescriptionHint => 'Description (optional)';
+
+  @override
+  String get universal => 'Universal';
+
+  @override
+  String get copiedToClipboard => 'Copied to clipboard';
 }

lib/l10n/app_localizations_es.dart

@@ -1055,8 +1055,53 @@ class L10nEs extends L10n {
   String get cameraPermissionDenied => 'Permiso de cámara denegado';
 
   @override
-  String get paymentRequestNotSupported =>
-      'Los payment requests aún no están soportados';
+  String get paymentRequestTitle => 'Solicitud de pago';
+
+  @override
+  String get paymentRequestFrom => 'Solicitud de';
+
+  @override
+  String get paymentRequestAmount => 'Monto solicitado';
+
+  @override
+  String get paymentRequestDescription => 'Descripción';
+
+  @override
+  String get paymentRequestMints => 'Mints aceptados';
+
+  @override
+  String get paymentRequestAnyMint => 'Cualquier mint';
+
+  @override
+  String get paymentRequestPay => 'Pagar';
+
+  @override
+  String get paymentRequestPaying => 'Pagando...';
+
+  @override
+  String get paymentRequestSuccess => 'Pago enviado correctamente';
+
+  @override
+  String get paymentRequestNoTransport =>
+      'Esta solicitud no tiene método de entrega configurado';
+
+  @override
+  String get paymentRequestTransport => 'Transporte';
+
+  @override
+  String get paymentRequestMintNotAccepted =>
+      'Tu mint activo no está en la lista de mints aceptados';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return 'Unidad incompatible: la solicitud requiere $unit';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => 'Balance insuficiente';
+
+  @override
+  String get paymentRequestErrorParsing => 'Error al leer la solicitud de pago';
 
   @override
   String get p2pkTitle => 'Claves P2PK';
@@ -1158,4 +1203,31 @@ class L10nEs extends L10n {
   @override
   String get p2pkErrorCannotDeletePrimary =>
       'No se puede eliminar la clave principal';
+
+  @override
+  String get request => 'Solicitar';
+
+  @override
+  String get requestPayment => 'Solicitar pago';
+
+  @override
+  String get requestPaymentDescription => 'Generar solicitud de pago unificada';
+
+  @override
+  String get generateRequest => 'Generar solicitud';
+
+  @override
+  String get generatingRequest => 'Generando solicitud...';
+
+  @override
+  String get requestPaymentReceived => 'Pago recibido';
+
+  @override
+  String get requestDescriptionHint => 'Descripción (opcional)';
+
+  @override
+  String get universal => 'Universal';
+
+  @override
+  String get copiedToClipboard => 'Copiado al portapapeles';
 }

lib/l10n/app_localizations_fr.dart

@@ -1068,8 +1068,54 @@ class L10nFr extends L10n {
   String get cameraPermissionDenied => 'Permission de la caméra refusée';
 
   @override
-  String get paymentRequestNotSupported =>
-      'Les demandes de paiement ne sont pas encore prises en charge';
+  String get paymentRequestTitle => 'Demande de paiement';
+
+  @override
+  String get paymentRequestFrom => 'Demande de';
+
+  @override
+  String get paymentRequestAmount => 'Montant demandé';
+
+  @override
+  String get paymentRequestDescription => 'Description';
+
+  @override
+  String get paymentRequestMints => 'Mints acceptés';
+
+  @override
+  String get paymentRequestAnyMint => 'N\'importe quel mint';
+
+  @override
+  String get paymentRequestPay => 'Payer';
+
+  @override
+  String get paymentRequestPaying => 'Paiement en cours...';
+
+  @override
+  String get paymentRequestSuccess => 'Paiement envoyé avec succès';
+
+  @override
+  String get paymentRequestNoTransport =>
+      'Cette demande n\'a pas de méthode de livraison configurée';
+
+  @override
+  String get paymentRequestTransport => 'Transport';
+
+  @override
+  String get paymentRequestMintNotAccepted =>
+      'Votre mint actif n\'est pas dans la liste des mints acceptés';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return 'Unité incompatible : la demande nécessite $unit';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => 'Solde insuffisant';
+
+  @override
+  String get paymentRequestErrorParsing =>
+      'Erreur lors de la lecture de la demande de paiement';
 
   @override
   String get p2pkTitle => 'Clés P2PK';
@@ -1172,4 +1218,32 @@ class L10nFr extends L10n {
   @override
   String get p2pkErrorCannotDeletePrimary =>
       'Impossible de supprimer la clé principale';
+
+  @override
+  String get request => 'Demander';
+
+  @override
+  String get requestPayment => 'Demander un paiement';
+
+  @override
+  String get requestPaymentDescription =>
+      'Générer une demande de paiement unifiée';
+
+  @override
+  String get generateRequest => 'Générer la demande';
+
+  @override
+  String get generatingRequest => 'Génération en cours...';
+
+  @override
+  String get requestPaymentReceived => 'Paiement reçu';
+
+  @override
+  String get requestDescriptionHint => 'Description (facultatif)';
+
+  @override
+  String get universal => 'Universel';
+
+  @override
+  String get copiedToClipboard => 'Copié dans le presse-papiers';
 }

lib/l10n/app_localizations_it.dart

@@ -1058,8 +1058,54 @@ class L10nIt extends L10n {
   String get cameraPermissionDenied => 'Permesso fotocamera negato';
 
   @override
-  String get paymentRequestNotSupported =>
-      'Le richieste di pagamento non sono ancora supportate';
+  String get paymentRequestTitle => 'Richiesta di pagamento';
+
+  @override
+  String get paymentRequestFrom => 'Richiesta da';
+
+  @override
+  String get paymentRequestAmount => 'Importo richiesto';
+
+  @override
+  String get paymentRequestDescription => 'Descrizione';
+
+  @override
+  String get paymentRequestMints => 'Mint accettati';
+
+  @override
+  String get paymentRequestAnyMint => 'Qualsiasi mint';
+
+  @override
+  String get paymentRequestPay => 'Paga';
+
+  @override
+  String get paymentRequestPaying => 'Pagamento in corso...';
+
+  @override
+  String get paymentRequestSuccess => 'Pagamento inviato con successo';
+
+  @override
+  String get paymentRequestNoTransport =>
+      'Questa richiesta non ha un metodo di consegna configurato';
+
+  @override
+  String get paymentRequestTransport => 'Trasporto';
+
+  @override
+  String get paymentRequestMintNotAccepted =>
+      'Il tuo mint attivo non è nella lista dei mint accettati';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return 'Unità incompatibile: la richiesta richiede $unit';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => 'Saldo insufficiente';
+
+  @override
+  String get paymentRequestErrorParsing =>
+      'Errore nella lettura della richiesta di pagamento';
 
   @override
   String get p2pkTitle => 'Chiavi P2PK';
@@ -1160,4 +1206,32 @@ class L10nIt extends L10n {
   @override
   String get p2pkErrorCannotDeletePrimary =>
       'Impossibile eliminare la chiave principale';
+
+  @override
+  String get request => 'Richiedi';
+
+  @override
+  String get requestPayment => 'Richiedi pagamento';
+
+  @override
+  String get requestPaymentDescription =>
+      'Genera richiesta di pagamento unificata';
+
+  @override
+  String get generateRequest => 'Genera richiesta';
+
+  @override
+  String get generatingRequest => 'Generazione in corso...';
+
+  @override
+  String get requestPaymentReceived => 'Pagamento ricevuto';
+
+  @override
+  String get requestDescriptionHint => 'Descrizione (opzionale)';
+
+  @override
+  String get universal => 'Universale';
+
+  @override
+  String get copiedToClipboard => 'Copiato negli appunti';
 }

lib/l10n/app_localizations_ja.dart

@@ -1038,7 +1038,51 @@ class L10nJa extends L10n {
   String get cameraPermissionDenied => 'カメラの許可が拒否されました';
 
   @override
-  String get paymentRequestNotSupported => '支払いリクエストはまだサポートされていません';
+  String get paymentRequestTitle => '支払いリクエスト';
+
+  @override
+  String get paymentRequestFrom => 'リクエスト元';
+
+  @override
+  String get paymentRequestAmount => 'リクエスト金額';
+
+  @override
+  String get paymentRequestDescription => '説明';
+
+  @override
+  String get paymentRequestMints => '対応ミント';
+
+  @override
+  String get paymentRequestAnyMint => 'すべてのミント';
+
+  @override
+  String get paymentRequestPay => '支払う';
+
+  @override
+  String get paymentRequestPaying => '支払い中...';
+
+  @override
+  String get paymentRequestSuccess => '支払いが正常に送信されました';
+
+  @override
+  String get paymentRequestNoTransport => 'このリクエストには配信方法が設定されていません';
+
+  @override
+  String get paymentRequestTransport => 'トランスポート';
+
+  @override
+  String get paymentRequestMintNotAccepted => 'アクティブなミントは対応ミントリストにありません';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return '単位が互換性がありません：リクエストには$unitが必要です';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => '残高不足';
+
+  @override
+  String get paymentRequestErrorParsing => '支払いリクエストの読み取りエラー';
 
   @override
   String get p2pkTitle => 'P2PK鍵';
@@ -1136,4 +1180,31 @@ class L10nJa extends L10n {
 
   @override
   String get p2pkErrorCannotDeletePrimary => 'プライマリ鍵は削除できません';
+
+  @override
+  String get request => 'リクエスト';
+
+  @override
+  String get requestPayment => '支払いをリクエスト';
+
+  @override
+  String get requestPaymentDescription => '統合支払いリクエストを生成';
+
+  @override
+  String get generateRequest => 'リクエストを生成';
+
+  @override
+  String get generatingRequest => '生成中...';
+
+  @override
+  String get requestPaymentReceived => '支払いを受け取りました';
+
+  @override
+  String get requestDescriptionHint => '説明（任意）';
+
+  @override
+  String get universal => 'ユニバーサル';
+
+  @override
+  String get copiedToClipboard => 'クリップボードにコピーしました';
 }

lib/l10n/app_localizations_ko.dart

@@ -1040,7 +1040,51 @@ class L10nKo extends L10n {
   String get cameraPermissionDenied => '카메라 권한이 거부되었습니다';
 
   @override
-  String get paymentRequestNotSupported => '결제 요청은 아직 지원되지 않습니다';
+  String get paymentRequestTitle => '결제 요청';
+
+  @override
+  String get paymentRequestFrom => '요청자';
+
+  @override
+  String get paymentRequestAmount => '요청 금액';
+
+  @override
+  String get paymentRequestDescription => '설명';
+
+  @override
+  String get paymentRequestMints => '허용된 민트';
+
+  @override
+  String get paymentRequestAnyMint => '모든 민트';
+
+  @override
+  String get paymentRequestPay => '결제';
+
+  @override
+  String get paymentRequestPaying => '결제 중...';
+
+  @override
+  String get paymentRequestSuccess => '결제가 성공적으로 전송되었습니다';
+
+  @override
+  String get paymentRequestNoTransport => '이 요청에는 전달 방법이 설정되지 않았습니다';
+
+  @override
+  String get paymentRequestTransport => '전송 방식';
+
+  @override
+  String get paymentRequestMintNotAccepted => '활성 민트가 허용된 민트 목록에 없습니다';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return '호환되지 않는 단위: 요청에 $unit이(가) 필요합니다';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => '잔액 부족';
+
+  @override
+  String get paymentRequestErrorParsing => '결제 요청을 읽는 중 오류 발생';
 
   @override
   String get p2pkTitle => 'P2PK 키';
@@ -1138,4 +1182,31 @@ class L10nKo extends L10n {
 
   @override
   String get p2pkErrorCannotDeletePrimary => '기본 키는 삭제할 수 없습니다';
+
+  @override
+  String get request => '요청';
+
+  @override
+  String get requestPayment => '결제 요청';
+
+  @override
+  String get requestPaymentDescription => '통합 결제 요청 생성';
+
+  @override
+  String get generateRequest => '요청 생성';
+
+  @override
+  String get generatingRequest => '생성 중...';
+
+  @override
+  String get requestPaymentReceived => '결제가 수신되었습니다';
+
+  @override
+  String get requestDescriptionHint => '설명 (선택사항)';
+
+  @override
+  String get universal => '유니버설';
+
+  @override
+  String get copiedToClipboard => '클립보드에 복사되었습니다';
 }

lib/l10n/app_localizations_pt.dart

@@ -1057,8 +1057,54 @@ class L10nPt extends L10n {
   String get cameraPermissionDenied => 'Permissão de câmera negada';
 
   @override
-  String get paymentRequestNotSupported =>
-      'Solicitações de pagamento ainda não são suportadas';
+  String get paymentRequestTitle => 'Solicitação de pagamento';
+
+  @override
+  String get paymentRequestFrom => 'Solicitação de';
+
+  @override
+  String get paymentRequestAmount => 'Valor solicitado';
+
+  @override
+  String get paymentRequestDescription => 'Descrição';
+
+  @override
+  String get paymentRequestMints => 'Mints aceitos';
+
+  @override
+  String get paymentRequestAnyMint => 'Qualquer mint';
+
+  @override
+  String get paymentRequestPay => 'Pagar';
+
+  @override
+  String get paymentRequestPaying => 'Pagando...';
+
+  @override
+  String get paymentRequestSuccess => 'Pagamento enviado com sucesso';
+
+  @override
+  String get paymentRequestNoTransport =>
+      'Esta solicitação não tem método de entrega configurado';
+
+  @override
+  String get paymentRequestTransport => 'Transporte';
+
+  @override
+  String get paymentRequestMintNotAccepted =>
+      'Seu mint ativo não está na lista de mints aceitos';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return 'Unidade incompatível: a solicitação requer $unit';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => 'Saldo insuficiente';
+
+  @override
+  String get paymentRequestErrorParsing =>
+      'Erro ao ler a solicitação de pagamento';
 
   @override
   String get p2pkTitle => 'Chaves P2PK';
@@ -1160,4 +1206,32 @@ class L10nPt extends L10n {
   @override
   String get p2pkErrorCannotDeletePrimary =>
       'Não é possível excluir a chave principal';
+
+  @override
+  String get request => 'Solicitar';
+
+  @override
+  String get requestPayment => 'Solicitar pagamento';
+
+  @override
+  String get requestPaymentDescription =>
+      'Gerar solicitação de pagamento unificada';
+
+  @override
+  String get generateRequest => 'Gerar solicitação';
+
+  @override
+  String get generatingRequest => 'Gerando solicitação...';
+
+  @override
+  String get requestPaymentReceived => 'Pagamento recebido';
+
+  @override
+  String get requestDescriptionHint => 'Descrição (opcional)';
+
+  @override
+  String get universal => 'Universal';
+
+  @override
+  String get copiedToClipboard => 'Copiado para a área de transferência';
 }

lib/l10n/app_localizations_ru.dart

@@ -1054,8 +1054,53 @@ class L10nRu extends L10n {
   String get cameraPermissionDenied => 'Доступ к камере запрещён';
 
   @override
-  String get paymentRequestNotSupported =>
-      'Запросы на оплату пока не поддерживаются';
+  String get paymentRequestTitle => 'Запрос на оплату';
+
+  @override
+  String get paymentRequestFrom => 'Запрос от';
+
+  @override
+  String get paymentRequestAmount => 'Запрошенная сумма';
+
+  @override
+  String get paymentRequestDescription => 'Описание';
+
+  @override
+  String get paymentRequestMints => 'Принимаемые минты';
+
+  @override
+  String get paymentRequestAnyMint => 'Любой минт';
+
+  @override
+  String get paymentRequestPay => 'Оплатить';
+
+  @override
+  String get paymentRequestPaying => 'Оплата...';
+
+  @override
+  String get paymentRequestSuccess => 'Платёж успешно отправлен';
+
+  @override
+  String get paymentRequestNoTransport =>
+      'В этом запросе не настроен метод доставки';
+
+  @override
+  String get paymentRequestTransport => 'Транспорт';
+
+  @override
+  String get paymentRequestMintNotAccepted =>
+      'Ваш активный минт не в списке принимаемых';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return 'Несовместимая единица: запрос требует $unit';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => 'Недостаточный баланс';
+
+  @override
+  String get paymentRequestErrorParsing => 'Ошибка чтения запроса на оплату';
 
   @override
   String get p2pkTitle => 'Ключи P2PK';
@@ -1157,4 +1202,32 @@ class L10nRu extends L10n {
 
   @override
   String get p2pkErrorCannotDeletePrimary => 'Невозможно удалить основной ключ';
+
+  @override
+  String get request => 'Запросить';
+
+  @override
+  String get requestPayment => 'Запросить платёж';
+
+  @override
+  String get requestPaymentDescription =>
+      'Создать унифицированный запрос на оплату';
+
+  @override
+  String get generateRequest => 'Создать запрос';
+
+  @override
+  String get generatingRequest => 'Создание запроса...';
+
+  @override
+  String get requestPaymentReceived => 'Платёж получен';
+
+  @override
+  String get requestDescriptionHint => 'Описание (необязательно)';
+
+  @override
+  String get universal => 'Универсальный';
+
+  @override
+  String get copiedToClipboard => 'Скопировано в буфер обмена';
 }

lib/l10n/app_localizations_sw.dart

@@ -1057,7 +1057,54 @@ class L10nSw extends L10n {
   String get cameraPermissionDenied => 'Ruhusa ya kamera imekataliwa';
 
   @override
-  String get paymentRequestNotSupported => 'Maombi ya malipo bado hayatumiki';
+  String get paymentRequestTitle => 'Ombi la malipo';
+
+  @override
+  String get paymentRequestFrom => 'Ombi kutoka';
+
+  @override
+  String get paymentRequestAmount => 'Kiasi kilichoombwa';
+
+  @override
+  String get paymentRequestDescription => 'Maelezo';
+
+  @override
+  String get paymentRequestMints => 'Mint zinazokubaliwa';
+
+  @override
+  String get paymentRequestAnyMint => 'Mint yoyote';
+
+  @override
+  String get paymentRequestPay => 'Lipa';
+
+  @override
+  String get paymentRequestPaying => 'Inalipa...';
+
+  @override
+  String get paymentRequestSuccess => 'Malipo yametumwa kwa mafanikio';
+
+  @override
+  String get paymentRequestNoTransport =>
+      'Ombi hili halina njia ya uwasilishaji iliyosanidiwa';
+
+  @override
+  String get paymentRequestTransport => 'Njia ya usafirishaji';
+
+  @override
+  String get paymentRequestMintNotAccepted =>
+      'Mint yako hai haiko kwenye orodha ya mint zinazokubaliwa';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return 'Kitengo kisichooana: ombi linahitaji $unit';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => 'Salio haitoshi';
+
+  @override
+  String get paymentRequestErrorParsing =>
+      'Hitilafu wakati wa kusoma ombi la malipo';
 
   @override
   String get p2pkTitle => 'Funguo za P2PK';
@@ -1157,4 +1204,31 @@ class L10nSw extends L10n {
 
   @override
   String get p2pkErrorCannotDeletePrimary => 'Haiwezekani kufuta ufunguo mkuu';
+
+  @override
+  String get request => 'Omba';
+
+  @override
+  String get requestPayment => 'Omba malipo';
+
+  @override
+  String get requestPaymentDescription => 'Tengeneza ombi la malipo la pamoja';
+
+  @override
+  String get generateRequest => 'Tengeneza ombi';
+
+  @override
+  String get generatingRequest => 'Inatengeneza ombi...';
+
+  @override
+  String get requestPaymentReceived => 'Malipo limepokelewa';
+
+  @override
+  String get requestDescriptionHint => 'Maelezo (si lazima)';
+
+  @override
+  String get universal => 'Universal';
+
+  @override
+  String get copiedToClipboard => 'Imenakiliwa kwenye ubao wa kunakili';
 }

lib/l10n/app_localizations_zh.dart

@@ -1034,7 +1034,51 @@ class L10nZh extends L10n {
   String get cameraPermissionDenied => '相机权限被拒绝';
 
   @override
-  String get paymentRequestNotSupported => '付款请求尚不支持';
+  String get paymentRequestTitle => '付款请求';
+
+  @override
+  String get paymentRequestFrom => '来自';
+
+  @override
+  String get paymentRequestAmount => '请求金额';
+
+  @override
+  String get paymentRequestDescription => '描述';
+
+  @override
+  String get paymentRequestMints => '接受的铸造厂';
+
+  @override
+  String get paymentRequestAnyMint => '任何铸造厂';
+
+  @override
+  String get paymentRequestPay => '支付';
+
+  @override
+  String get paymentRequestPaying => '支付中...';
+
+  @override
+  String get paymentRequestSuccess => '付款发送成功';
+
+  @override
+  String get paymentRequestNoTransport => '此请求未配置交付方式';
+
+  @override
+  String get paymentRequestTransport => '传输方式';
+
+  @override
+  String get paymentRequestMintNotAccepted => '您的活跃铸造厂不在接受的铸造厂列表中';
+
+  @override
+  String paymentRequestUnitMismatch(String unit) {
+    return '单位不兼容：请求需要 $unit';
+  }
+
+  @override
+  String get paymentRequestInsufficientBalance => '余额不足';
+
+  @override
+  String get paymentRequestErrorParsing => '读取付款请求时出错';
 
   @override
   String get p2pkTitle => 'P2PK密钥';
@@ -1131,4 +1175,31 @@ class L10nZh extends L10n {
 
   @override
   String get p2pkErrorCannotDeletePrimary => '无法删除主密钥';
+
+  @override
+  String get request => '请求';
+
+  @override
+  String get requestPayment => '请求付款';
+
+  @override
+  String get requestPaymentDescription => '生成统一付款请求';
+
+  @override
+  String get generateRequest => '生成请求';
+
+  @override
+  String get generatingRequest => '正在生成请求...';
+
+  @override
+  String get requestPaymentReceived => '已收到付款';
+
+  @override
+  String get requestDescriptionHint => '描述（可选）';
+
+  @override
+  String get universal => '通用';
+
+  @override
+  String get copiedToClipboard => '已复制到剪贴板';
 }

lib/l10n/app_pt.arb

@@ -502,7 +502,22 @@
   "scanLightningInvoiceHint": "Escaneie um invoice Lightning (lnbc...)",
   "addMintQuestion": "Adicionar este mint?",
   "cameraPermissionDenied": "Permissão de câmera negada",
-  "paymentRequestNotSupported": "Solicitações de pagamento ainda não são suportadas",
+  "paymentRequestTitle": "Solicitação de pagamento",
+  "paymentRequestFrom": "Solicitação de",
+  "paymentRequestAmount": "Valor solicitado",
+  "paymentRequestDescription": "Descrição",
+  "paymentRequestMints": "Mints aceitos",
+  "paymentRequestAnyMint": "Qualquer mint",
+  "paymentRequestPay": "Pagar",
+  "paymentRequestPaying": "Pagando...",
+  "paymentRequestSuccess": "Pagamento enviado com sucesso",
+  "paymentRequestNoTransport": "Esta solicitação não tem método de entrega configurado",
+  "paymentRequestTransport": "Transporte",
+  "paymentRequestMintNotAccepted": "Seu mint ativo não está na lista de mints aceitos",
+  "paymentRequestUnitMismatch": "Unidade incompatível: a solicitação requer {unit}",
+  "paymentRequestInsufficientBalance": "Saldo insuficiente",
+  "paymentRequestErrorParsing": "Erro ao ler a solicitação de pagamento",
+
   "p2pkTitle": "Chaves P2PK",
   "p2pkSettingsDescription": "Receber ecash bloqueado",
   "p2pkExperimental": "P2PK é experimental. Use com cautela.",
@@ -534,5 +549,15 @@
   "p2pkErrorInvalidNsec": "nsec inválido",
   "p2pkErrorKeyAlreadyExists": "Esta chave já existe",
   "p2pkErrorKeyNotFound": "Chave não encontrada",
-  "p2pkErrorCannotDeletePrimary": "Não é possível excluir a chave principal"
+  "p2pkErrorCannotDeletePrimary": "Não é possível excluir a chave principal",
+
+  "request": "Solicitar",
+  "requestPayment": "Solicitar pagamento",
+  "requestPaymentDescription": "Gerar solicitação de pagamento unificada",
+  "generateRequest": "Gerar solicitação",
+  "generatingRequest": "Gerando solicitação...",
+  "requestPaymentReceived": "Pagamento recebido",
+  "requestDescriptionHint": "Descrição (opcional)",
+  "universal": "Universal",
+  "copiedToClipboard": "Copiado para a área de transferência"
 }

lib/l10n/app_ru.arb

@@ -502,7 +502,22 @@
   "scanLightningInvoiceHint": "Сканируйте Lightning счёт (lnbc...)",
   "addMintQuestion": "Добавить этот mint?",
   "cameraPermissionDenied": "Доступ к камере запрещён",
-  "paymentRequestNotSupported": "Запросы на оплату пока не поддерживаются",
+  "paymentRequestTitle": "Запрос на оплату",
+  "paymentRequestFrom": "Запрос от",
+  "paymentRequestAmount": "Запрошенная сумма",
+  "paymentRequestDescription": "Описание",
+  "paymentRequestMints": "Принимаемые минты",
+  "paymentRequestAnyMint": "Любой минт",
+  "paymentRequestPay": "Оплатить",
+  "paymentRequestPaying": "Оплата...",
+  "paymentRequestSuccess": "Платёж успешно отправлен",
+  "paymentRequestNoTransport": "В этом запросе не настроен метод доставки",
+  "paymentRequestTransport": "Транспорт",
+  "paymentRequestMintNotAccepted": "Ваш активный минт не в списке принимаемых",
+  "paymentRequestUnitMismatch": "Несовместимая единица: запрос требует {unit}",
+  "paymentRequestInsufficientBalance": "Недостаточный баланс",
+  "paymentRequestErrorParsing": "Ошибка чтения запроса на оплату",
+
   "p2pkTitle": "Ключи P2PK",
   "p2pkSettingsDescription": "Получить заблокированный ecash",
   "p2pkExperimental": "P2PK экспериментальный. Используйте с осторожностью.",
@@ -534,5 +549,15 @@
   "p2pkErrorInvalidNsec": "Недействительный nsec",
   "p2pkErrorKeyAlreadyExists": "Этот ключ уже существует",
   "p2pkErrorKeyNotFound": "Ключ не найден",
-  "p2pkErrorCannotDeletePrimary": "Невозможно удалить основной ключ"
+  "p2pkErrorCannotDeletePrimary": "Невозможно удалить основной ключ",
+
+  "request": "Запросить",
+  "requestPayment": "Запросить платёж",
+  "requestPaymentDescription": "Создать унифицированный запрос на оплату",
+  "generateRequest": "Создать запрос",
+  "generatingRequest": "Создание запроса...",
+  "requestPaymentReceived": "Платёж получен",
+  "requestDescriptionHint": "Описание (необязательно)",
+  "universal": "Универсальный",
+  "copiedToClipboard": "Скопировано в буфер обмена"
 }

lib/l10n/app_sw.arb

@@ -502,7 +502,22 @@
   "scanLightningInvoiceHint": "Changanua ankara ya Lightning (lnbc...)",
   "addMintQuestion": "Ongeza mint hii?",
   "cameraPermissionDenied": "Ruhusa ya kamera imekataliwa",
-  "paymentRequestNotSupported": "Maombi ya malipo bado hayatumiki",
+  "paymentRequestTitle": "Ombi la malipo",
+  "paymentRequestFrom": "Ombi kutoka",
+  "paymentRequestAmount": "Kiasi kilichoombwa",
+  "paymentRequestDescription": "Maelezo",
+  "paymentRequestMints": "Mint zinazokubaliwa",
+  "paymentRequestAnyMint": "Mint yoyote",
+  "paymentRequestPay": "Lipa",
+  "paymentRequestPaying": "Inalipa...",
+  "paymentRequestSuccess": "Malipo yametumwa kwa mafanikio",
+  "paymentRequestNoTransport": "Ombi hili halina njia ya uwasilishaji iliyosanidiwa",
+  "paymentRequestTransport": "Njia ya usafirishaji",
+  "paymentRequestMintNotAccepted": "Mint yako hai haiko kwenye orodha ya mint zinazokubaliwa",
+  "paymentRequestUnitMismatch": "Kitengo kisichooana: ombi linahitaji {unit}",
+  "paymentRequestInsufficientBalance": "Salio haitoshi",
+  "paymentRequestErrorParsing": "Hitilafu wakati wa kusoma ombi la malipo",
+
   "p2pkTitle": "Funguo za P2PK",
   "p2pkSettingsDescription": "Pokea ecash iliyofungwa",
   "p2pkExperimental": "P2PK ni ya majaribio. Tumia kwa uangalifu.",
@@ -534,5 +549,15 @@
   "p2pkErrorInvalidNsec": "nsec batili",
   "p2pkErrorKeyAlreadyExists": "Ufunguo huu tayari upo",
   "p2pkErrorKeyNotFound": "Ufunguo haujapatikana",
-  "p2pkErrorCannotDeletePrimary": "Haiwezekani kufuta ufunguo mkuu"
+  "p2pkErrorCannotDeletePrimary": "Haiwezekani kufuta ufunguo mkuu",
+
+  "request": "Omba",
+  "requestPayment": "Omba malipo",
+  "requestPaymentDescription": "Tengeneza ombi la malipo la pamoja",
+  "generateRequest": "Tengeneza ombi",
+  "generatingRequest": "Inatengeneza ombi...",
+  "requestPaymentReceived": "Malipo limepokelewa",
+  "requestDescriptionHint": "Maelezo (si lazima)",
+  "universal": "Universal",
+  "copiedToClipboard": "Imenakiliwa kwenye ubao wa kunakili"
 }

lib/l10n/app_zh.arb

@@ -502,7 +502,22 @@
   "scanLightningInvoiceHint": "扫描闪电发票（lnbc...）",
   "addMintQuestion": "添加此铸造厂？",
   "cameraPermissionDenied": "相机权限被拒绝",
-  "paymentRequestNotSupported": "付款请求尚不支持",
+  "paymentRequestTitle": "付款请求",
+  "paymentRequestFrom": "来自",
+  "paymentRequestAmount": "请求金额",
+  "paymentRequestDescription": "描述",
+  "paymentRequestMints": "接受的铸造厂",
+  "paymentRequestAnyMint": "任何铸造厂",
+  "paymentRequestPay": "支付",
+  "paymentRequestPaying": "支付中...",
+  "paymentRequestSuccess": "付款发送成功",
+  "paymentRequestNoTransport": "此请求未配置交付方式",
+  "paymentRequestTransport": "传输方式",
+  "paymentRequestMintNotAccepted": "您的活跃铸造厂不在接受的铸造厂列表中",
+  "paymentRequestUnitMismatch": "单位不兼容：请求需要 {unit}",
+  "paymentRequestInsufficientBalance": "余额不足",
+  "paymentRequestErrorParsing": "读取付款请求时出错",
+
   "p2pkTitle": "P2PK密钥",
   "p2pkSettingsDescription": "接收锁定的ecash",
   "p2pkExperimental": "P2PK是实验性功能。请谨慎使用。",
@@ -534,5 +549,15 @@
   "p2pkErrorInvalidNsec": "无效的nsec",
   "p2pkErrorKeyAlreadyExists": "此密钥已存在",
   "p2pkErrorKeyNotFound": "未找到密钥",
-  "p2pkErrorCannotDeletePrimary": "无法删除主密钥"
+  "p2pkErrorCannotDeletePrimary": "无法删除主密钥",
+
+  "request": "请求",
+  "requestPayment": "请求付款",
+  "requestPaymentDescription": "生成统一付款请求",
+  "generateRequest": "生成请求",
+  "generatingRequest": "正在生成请求...",
+  "requestPaymentReceived": "已收到付款",
+  "requestDescriptionHint": "描述（可选）",
+  "universal": "通用",
+  "copiedToClipboard": "已复制到剪贴板"
 }

lib/providers/wallet_provider.dart

@@ -7,13 +7,16 @@ import '../src/rust/api/wallet.dart';
 import '../src/rust/api/token.dart';
 import '../src/rust/api/mint_info.dart';
 import '../src/rust/api/keys.dart';
+import '../src/rust/api/payment_request.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:uuid/uuid.dart';
 import '../data/transaction_meta_storage.dart';
 import '../data/pending_token.dart';
 import '../data/pending_token_storage.dart';
 import '../core/utils/keyset_debug.dart';
+import '../core/utils/p2pk_utils.dart';
 import '../widgets/effects/cashu_confetti.dart';
 
 /// Helper class para info de token parseado
@@ -65,6 +68,10 @@ class WalletProvider extends ChangeNotifier {
   /// Caché de MintInfo por URL (nombre, logo, contactos, etc.)
   final Map<String, MintInfo> _mintInfoCache = {};
 
+  /// Caché del balance stream para evitar recrear StreamSink en cada build().
+  Stream<BigInt>? _cachedBalanceStream;
+  String? _cachedBalanceKey;
+
   /// Mint activo actualmente
   String? _activeMintUrl;
 
@@ -76,6 +83,7 @@ class WalletProvider extends ChangeNotifier {
   static const _activeMintKey = 'wallet_active_mint';
   static const _activeUnitKey = 'wallet_active_unit';
   static const _pendingMintInvoicesKey = 'pending_mint_invoices';
+  static const _pendingNostrRequestKey = 'pending_nostr_request';
 
   /// Mint de Cuba Bitcoin - siempre aparece primero en la lista
   static const cubaBitcoinMint = 'https://mint.cubabitcoin.org';
@@ -348,6 +356,10 @@ class WalletProvider extends ChangeNotifier {
         }
       }
       debugPrint('Mints restaurados: ${_mintUnits.keys.length}');
+
+      // Re-detectar unidades en background (sin bloquear arranque).
+      // Si el mint ahora soporta más unidades (ej: usd), se actualizan.
+      _refreshAllMintUnits();
     } else {
       // Primera vez - agregar mint por defecto
       await addMint('https://mint.cubabitcoin.org');
@@ -399,6 +411,62 @@ class WalletProvider extends ChangeNotifier {
     return await getWallet(_activeMintUrl!, _activeUnit);
   }
 
+  /// Re-detecta unidades de todos los mints conocidos via NUT-04.
+  /// Corre en background sin bloquear el arranque. Solo notifica si hay cambios.
+  void _refreshAllMintUnits() async {
+    bool changed = false;
+
+    for (final mintUrl in _mintUnits.keys.toList()) {
+      try {
+        final mintInfo = await getMintInfo(mintUrl: mintUrl);
+        final units = <String>{};
+        for (final method in mintInfo.nuts.nut04.methods) {
+          units.add(method.unit);
+        }
+        final unitList = units.isEmpty ? ['sat'] : units.toList();
+        unitList.sort((a, b) {
+          if (a == 'sat') return -1;
+          if (b == 'sat') return 1;
+          return a.compareTo(b);
+        });
+
+        final previous = _mintUnits[mintUrl];
+        if (!_listEquals(previous, unitList)) {
+          _mintUnits[mintUrl] = unitList;
+          changed = true;
+          debugPrint('Unidades actualizadas para $mintUrl: $unitList');
+
+          // Validar _activeUnit si este es el mint activo
+          if (mintUrl == _activeMintUrl && !unitList.contains(_activeUnit)) {
+            _activeUnit = unitList.first;
+            debugPrint('Active unit reset to ${unitList.first} for $mintUrl');
+          }
+        }
+      } catch (e) {
+        debugPrint('Error refrescando unidades de $mintUrl: $e');
+      }
+    }
+
+    if (changed) {
+      try {
+        await _saveMints();
+      } catch (e) {
+        debugPrint('Error guardando mints actualizados: $e');
+      }
+      notifyListeners();
+    }
+  }
+
+  /// Compara dos listas de strings por valor.
+  bool _listEquals(List<String>? a, List<String>? b) {
+    if (a == null || b == null) return a == b;
+    if (a.length != b.length) return false;
+    for (int i = 0; i < a.length; i++) {
+      if (a[i] != b[i]) return false;
+    }
+    return true;
+  }
+
   // ============================================================
   // MULTI-MINT OPERATIONS
   // ============================================================
@@ -598,8 +666,21 @@ class WalletProvider extends ChangeNotifier {
   // ============================================================
 
   /// Stream de balance del wallet activo (reactivo).
+  /// Cacheado para que StreamBuilder reciba el mismo objeto entre rebuilds
+  /// y no mate el StreamSink de Rust.
   Stream<BigInt>? streamBalance() {
-    return activeWallet?.streamBalance();
+    final wallet = activeWallet;
+    if (wallet == null) {
+      _cachedBalanceStream = null;
+      _cachedBalanceKey = null;
+      return null;
+    }
+    final key = '$_activeMintUrl:$_activeUnit';
+    if (_cachedBalanceKey != key) {
+      _cachedBalanceStream = wallet.streamBalance().asBroadcastStream();
+      _cachedBalanceKey = key;
+    }
+    return _cachedBalanceStream;
   }
 
   /// Obtiene el balance del wallet activo.
@@ -840,7 +921,20 @@ class WalletProvider extends ChangeNotifier {
     // DEBUG: transacciones ANTES del receive
     await _debugLogTransactions(wallet, 'BEFORE receive');
 
-    final amount = await wallet.receive(token: token, opts: opts);
+    BigInt amount;
+    try {
+      amount = await wallet.receive(token: token, opts: opts);
+    } catch (e) {
+      final errorStr = e.toString().toLowerCase();
+      if (errorStr.contains('already signed')) {
+        debugPrint('[RECEIVE] Already signed error, restoring wallet counters...');
+        await wallet.restore();
+        // Retry once after counter resync
+        amount = await wallet.receive(token: token, opts: opts);
+      } else {
+        rethrow;
+      }
+    }
 
     // DEBUG: counters después de receive
     await KeysetDebug.logCounters('AFTER receive ($unit)');
@@ -962,45 +1056,33 @@ class WalletProvider extends ChangeNotifier {
   Future<String> confirmSend(PreparedSend prepared, String? memo) async {
     final wallet = await getActiveWallet();
 
-    final token = await wallet.send(
+    final result = await wallet.send(
       send: prepared,
       memo: memo,
       includeMemo: memo != null && memo.isNotEmpty,
     );
 
-    // Guardar token en storage local para mostrar en detalles del historial.
-    // Usamos hash del token como key temporal; después buscaremos la transacción.
-    await _saveTokenForRecentTransaction(token.encoded);
-
-    notifyListeners();
-    return token.encoded;
-  }
-
-  /// Guarda el token para la transacción más reciente de tipo send.
-  Future<void> _saveTokenForRecentTransaction(String tokenEncoded) async {
-    try {
-      // Obtener transacciones outgoing más recientes
-      final wallet = await getActiveWallet();
-      final txs = await wallet.listTransactions(
-        direction: TransactionDirection.outgoing,
-      );
-
-      if (txs.isNotEmpty) {
-        // La más reciente debería ser la que acabamos de crear
-        final recentTx = txs.first;
-
+    // Save token metadata using the deterministic transaction ID returned by CDK
+    // (SHA-256 of sorted proof Y values — no racy listTransactions needed)
+    // Best-effort: don't fail the send if metadata persistence fails
+    final txId = result.transactionId;
+    if (txId != null && txId.isNotEmpty) {
+      try {
         await _txMetaStorage.save(
-          recentTx.id,
+          txId,
           TransactionMeta(
             type: TransactionType.cashu,
-            token: tokenEncoded,
+            token: result.token.encoded,
           ),
         );
-        debugPrint('Token guardado para tx ${recentTx.id}');
+        debugPrint('Token guardado para tx $txId');
+      } catch (e) {
+        debugPrint('Error guardando send metadata: $e');
       }
-    } catch (e) {
-      debugPrint('Error guardando token metadata: $e');
     }
+
+    notifyListeners();
+    return result.token.encoded;
   }
 
   /// Cancela un envío preparado (libera proofs reservados).
@@ -1062,6 +1144,27 @@ class WalletProvider extends ChangeNotifier {
     }
   }
 
+  // ============================================================
+  // PAYMENT REQUEST (NUT-18/26)
+  // ============================================================
+
+  /// Paga un Payment Request (NUT-18 creqA / NUT-26 creqB / BIP-321).
+  /// CDK maneja: NUT-10 spending conditions, transporte (Nostr/HTTP POST),
+  /// preparación del token y entrega automática.
+  Future<void> payPaymentRequest(
+    String encodedRequest, {
+    BigInt? customAmount,
+  }) async {
+    final wallet = await getActiveWallet();
+    debugPrint('[PAY_REQUEST] Paying payment request via ${wallet.mintUrl}');
+    await wallet.payPaymentRequest(
+      encoded: encodedRequest,
+      customAmount: customAmount,
+    );
+    debugPrint('[PAY_REQUEST] Payment delivered successfully');
+    notifyListeners();
+  }
+
   // ============================================================
   // MINT (Depositar via Lightning)
   // ============================================================
@@ -1091,12 +1194,14 @@ class WalletProvider extends ChangeNotifier {
       _activeMintController!.close();
     }
 
-    // StreamController que la UI puede escuchar y cancelar libremente
-    final controller = StreamController<MintQuote>();
+    // StreamController que la UI puede escuchar y cancelar libremente.
+    // sync: true para no perder eventos rápidos (paid → issued en µs).
+    final controller = StreamController<MintQuote>(sync: true);
     _activeMintController = controller;
 
-    // Cancelar suscripción anterior si existe (await evita race de callbacks)
-    await _activeMintSubscription?.cancel();
+    // Cancelar suscripción anterior sin await: el task de Rust (polling + WS)
+    // puede tardar en cerrar y bloquearía la creación de una nueva factura.
+    _activeMintSubscription?.cancel();
     _activeMintSubscription = null;
 
     // Suscribirse al stream del CDK desde el provider (persiste sin UI)
@@ -1104,7 +1209,7 @@ class WalletProvider extends ChangeNotifier {
       amount: amount,
       description: description,
     ).listen(
-      (quote) {
+      (quote) async {
         // Guardar invoice temprano en SharedPreferences
         if (quote.state == MintQuoteState.unpaid) {
           invoiceBolt11 = quote.request;
@@ -1113,8 +1218,10 @@ class WalletProvider extends ChangeNotifier {
 
         // Cuando se completa, guardar metadata, confetti, limpiar pending
         if (quote.state == MintQuoteState.issued && invoiceBolt11 != null) {
-          _saveMintMetadata(wallet, invoiceBolt11!);
-          _removePendingMintInvoice(quote.id);
+          final saved = await _saveMintMetadata(wallet, invoiceBolt11!, quote.transactionId);
+          // Only remove pending invoice if metadata was saved;
+          // otherwise _matchPendingMintInvoices can recover it on next startup
+          if (saved) _removePendingMintInvoice(quote.id);
         }
 
         // Reenviar a la UI (si sigue escuchando)
@@ -1223,29 +1330,155 @@ class WalletProvider extends ChangeNotifier {
     return null;
   }
 
-  /// Guarda metadata para una transacción de mint (Lightning deposit).
-  Future<void> _saveMintMetadata(Wallet wallet, String invoice) async {
+  // ============================================================
+  // PENDING NOSTR PAYMENT REQUESTS
+  // ============================================================
+
+  /// TTL for pending Nostr requests (24 hours).
+  static const _pendingNostrRequestTtl = Duration(hours: 24);
+  StreamSubscription<NostrPaymentEvent>? _pendingNostrSubscription;
+  bool _pendingNostrResumeAttempted = false;
+  static const _pendingNostrSecretKey = 'pending_nostr_secret';
+  static const _secureStorage = FlutterSecureStorage();
+
+  /// Save a pending Nostr payment request for recovery after app restart.
+  /// Secret key goes to FlutterSecureStorage, metadata to SharedPreferences.
+  Future<void> savePendingNostrRequest(PersistedRequestData data) async {
     try {
-      final txs = await wallet.listTransactions(
-        direction: TransactionDirection.incoming,
+      // Secret key in encrypted storage
+      await _secureStorage.write(
+        key: _pendingNostrSecretKey,
+        value: data.secretHex,
+      );
+      // Metadata in SharedPreferences (no secrets)
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString(_pendingNostrRequestKey, jsonEncode({
+        'pubkeyHex': data.pubkeyHex,
+        'relays': data.relays,
+        'amount': data.amount?.toString(),
+        'unit': data.unit,
+        'mintUrl': data.mintUrl,
+        'createdAt': DateTime.now().toIso8601String(),
+      }));
+    } catch (e) {
+      debugPrint('Error saving pending Nostr request: $e');
+    }
+  }
+
+  /// Remove the pending Nostr payment request (payment received or cancelled).
+  Future<void> removePendingNostrRequest() async {
+    try {
+      await _secureStorage.delete(key: _pendingNostrSecretKey);
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.remove(_pendingNostrRequestKey);
+    } catch (e) {
+      debugPrint('Error removing pending Nostr request: $e');
+    }
+  }
+
+  /// Check for a pending Nostr payment request and resume listening.
+  /// Called automatically during app startup. Guarded against duplicate calls.
+  Future<void> resumePendingNostrRequest() async {
+    if (_pendingNostrResumeAttempted) return;
+    _pendingNostrResumeAttempted = true;
+    await _pendingNostrSubscription?.cancel();
+    _pendingNostrSubscription = null;
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final jsonStr = prefs.getString(_pendingNostrRequestKey);
+      if (jsonStr == null) return;
+
+      final map = Map<String, dynamic>.from(jsonDecode(jsonStr));
+
+      // Check TTL
+      final createdAt = DateTime.tryParse(map['createdAt'] ?? '');
+      if (createdAt == null ||
+          DateTime.now().difference(createdAt) > _pendingNostrRequestTtl) {
+        await removePendingNostrRequest();
+        debugPrint('Pending Nostr request expired, removed');
+        return;
+      }
+
+      // Read secret from secure storage
+      final secretHex = await _secureStorage.read(key: _pendingNostrSecretKey);
+      if (secretHex == null) {
+        await prefs.remove(_pendingNostrRequestKey);
+        debugPrint('Pending Nostr request has no secret key, removed');
+        return;
+      }
+
+      // Reconstruct handle
+      final data = PersistedRequestData(
+        secretHex: secretHex,
+        pubkeyHex: map['pubkeyHex'] as String,
+        relays: List<String>.from(map['relays']),
+        amount: map['amount'] != null
+            ? BigInt.tryParse(map['amount'] as String)
+            : null,
+        unit: map['unit'] as String,
+        mintUrl: map['mintUrl'] as String,
       );
 
-      if (txs.isNotEmpty) {
-        final recentTx = txs.first;
+      final handle = NostrListenerHandle.fromPersisted(data: data);
 
+      // Get or create the wallet for this mint+unit (lazy instantiation)
+      Wallet wallet;
+      try {
+        wallet = await getWallet(data.mintUrl, data.unit);
+      } catch (e) {
+        debugPrint('No wallet for pending Nostr request: $e');
+        await removePendingNostrRequest();
+        return;
+      }
+
+      // Resume listening in background
+      debugPrint('Resuming pending Nostr payment request...');
+      _pendingNostrSubscription = wallet.waitForNostrPayment(handle: handle).listen(
+        (event) {
+          if (event.state == NostrPaymentState.received) {
+            debugPrint('Pending Nostr payment received: ${event.amount}');
+            removePendingNostrRequest();
+            confettiController.fire();
+            _pendingNostrSubscription?.cancel();
+            _pendingNostrSubscription = null;
+          }
+        },
+        onError: (error) {
+          debugPrint('Pending Nostr listener error (kept for retry): $error');
+          _pendingNostrSubscription = null;
+          _pendingNostrResumeAttempted = false; // Allow retry on next startup
+        },
+      );
+    } catch (e) {
+      debugPrint('Error resuming pending Nostr request: $e');
+    }
+  }
+
+  /// Guarda metadata para una transacción de mint (Lightning deposit).
+  /// Returns true if metadata was actually saved.
+  Future<bool> _saveMintMetadata(Wallet wallet, String invoice, String? transactionId) async {
+    try {
+      if (transactionId != null && transactionId.isNotEmpty) {
         await _txMetaStorage.save(
-          recentTx.id,
+          transactionId,
           TransactionMeta(
             type: TransactionType.lightning,
             invoice: invoice,
           ),
         );
-        debugPrint('Mint metadata guardada para tx ${recentTx.id}');
+        debugPrint('Mint metadata guardada para tx $transactionId');
         confettiController.fire();
         notifyListeners();
+        return true;
+      } else {
+        debugPrint('Mint metadata: no transaction ID available');
+        confettiController.fire();
+        notifyListeners();
+        return false;
       }
     } catch (e) {
       debugPrint('Error guardando mint metadata: $e');
+      return false;
     }
   }
 
@@ -1417,6 +1650,9 @@ class WalletProvider extends ChangeNotifier {
 
     // Vincular transacciones incoming sin metadata con pending invoices
     await _matchPendingMintInvoices();
+
+    // Resume pending Nostr payment request if app was killed mid-wait
+    await resumePendingNostrRequest();
   }
 
   /// Busca transacciones incoming sin metadata y las vincula con
@@ -1570,7 +1806,7 @@ class WalletProvider extends ChangeNotifier {
               // Enviar todo el balance
               final prepared =
                   await tempWallet.prepareSend(amount: tempBalance);
-              final token = await tempWallet.send(
+              final result = await tempWallet.send(
                 send: prepared,
                 memo: 'Recuperación El Caju',
                 includeMemo: true,
@@ -1578,7 +1814,7 @@ class WalletProvider extends ChangeNotifier {
 
               // Reclamar en nuestro wallet
               final ourWallet = await getWallet(mintUrl, unit);
-              final received = await ourWallet.receive(token: token);
+              final received = await ourWallet.receive(token: result.token);
               totalRecovered += received;
             }
           } catch (e) {
@@ -1617,6 +1853,8 @@ class WalletProvider extends ChangeNotifier {
       _activeUnit = 'sat';
       _mnemonic = null;
       _db = null;
+      _cachedBalanceStream = null;
+      _cachedBalanceKey = null;
 
       // Limpiar metadata de transacciones
       await _txMetaStorage.clear();
@@ -1645,6 +1883,8 @@ class WalletProvider extends ChangeNotifier {
     _activeUnit = 'sat';
     _mnemonic = null;
     _db = null;
+    _cachedBalanceStream = null;
+    _cachedBalanceKey = null;
     notifyListeners();
   }
 
@@ -1701,7 +1941,8 @@ class WalletProvider extends ChangeNotifier {
   /// Retorna el monto recibido si tiene éxito, o lanza excepción.
   /// Si el token está gastado o es inválido, lo elimina automáticamente.
   /// Verifica conectividad al mint antes de intentar reclamar.
-  Future<BigInt> claimPendingToken(String id) async {
+  /// [p2pkPrivateKey] clave privada para desbloquear tokens P2PK.
+  Future<BigInt> claimPendingToken(String id, {String? p2pkPrivateKey}) async {
     final pending = _pendingTokenStorage.get(id);
     if (pending == null) {
       throw Exception('Token pendiente no encontrado');
@@ -1714,8 +1955,16 @@ class WalletProvider extends ChangeNotifier {
     }
 
     try {
-      // Intentar reclamar usando el método existente
-      final amount = await receiveToken(pending.encoded);
+      BigInt amount;
+
+      if (P2PKUtils.isP2PKLocked(pending.encoded) && p2pkPrivateKey == null) {
+        throw Exception('P2PK token requires a private key to claim');
+      }
+
+      amount = await receiveToken(
+        pending.encoded,
+        p2pkPrivateKey: p2pkPrivateKey,
+      );
 
       // Éxito: eliminar de pending
       await _pendingTokenStorage.remove(id);
@@ -1744,7 +1993,8 @@ class WalletProvider extends ChangeNotifier {
 
   /// Verifica y reclama automáticamente tokens pendientes.
   /// Retorna un mapa con estadísticas: claimed, failed, removed, totalClaimed, unit.
-  Future<Map<String, dynamic>> checkPendingTokens() async {
+  /// [p2pkKeyResolver] función que dado un token encoded retorna la clave privada P2PK (o null).
+  Future<Map<String, dynamic>> checkPendingTokens({String? Function(String encodedToken)? p2pkKeyResolver}) async {
     final tokens = _pendingTokenStorage.listValid();
     if (tokens.isEmpty) {
       return {'claimed': 0, 'failed': 0, 'removed': 0, 'totalClaimed': BigInt.zero, 'unit': _activeUnit};
@@ -1758,7 +2008,8 @@ class WalletProvider extends ChangeNotifier {
 
     for (final token in tokens) {
       try {
-        final amount = await claimPendingToken(token.id);
+        final p2pkKey = p2pkKeyResolver?.call(token.encoded);
+        final amount = await claimPendingToken(token.id, p2pkPrivateKey: p2pkKey);
         claimed++;
         totalClaimed += amount;
         claimedUnit ??= token.unit; // Usar la unidad del primer token reclamado
@@ -1809,6 +2060,8 @@ class WalletProvider extends ChangeNotifier {
     if (_activeMintController != null && !_activeMintController!.isClosed) {
       _activeMintController!.close();
     }
+    _cachedBalanceStream = null;
+    _cachedBalanceKey = null;
     confettiController.dispose();
     super.dispose();
   }

lib/screens/10_scanner/scan_screen.dart

@@ -8,6 +8,7 @@ import '../../widgets/scanner/qr_scanner_widget.dart';
 import '../../providers/wallet_provider.dart';
 import '../4_receive/receive_screen.dart';
 import '../7_melt/melt_screen.dart';
+import '../11_payment_request/payment_request_screen.dart';
 
 /// Pantalla de escaneo QR con soporte para diferentes modos
 class ScanScreen extends StatefulWidget {
@@ -195,8 +196,17 @@ class _ScanScreenState extends State<ScanScreen> {
         break;
 
       case IncomingDataType.paymentRequest:
-        // TODO: Implementar manejo de payment requests (post-MVP)
-        _showError(l10n.paymentRequestNotSupported);
+        if (mounted) {
+          Navigator.pop(context);
+          Navigator.push(
+            context,
+            MaterialPageRoute(
+              builder: (context) => PaymentRequestScreen(
+                encodedRequest: data.raw,
+              ),
+            ),
+          );
+        }
         break;
 
       case IncomingDataType.unknown:
@@ -221,8 +231,10 @@ class _ScanScreenState extends State<ScanScreen> {
   }
 
   void _handleInvoiceOnlyMode(ParsedData data) {
-    if (data.type == IncomingDataType.lightningInvoice) {
-      // Retornar el invoice vía callback
+    if (data.type == IncomingDataType.lightningInvoice ||
+        (data.type == IncomingDataType.paymentRequest &&
+            data.invoiceBolt11 != null)) {
+      // Return the invoice — works for pure BOLT11 and BIP-321 URIs with lightning=
       Navigator.pop(context, data.invoiceBolt11 ?? data.raw);
       widget.onDataScanned?.call(data.invoiceBolt11 ?? data.raw);
     } else {

lib/screens/11_payment_request/payment_request_screen.dart

@@ -0,0 +1,338 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:lucide_icons/lucide_icons.dart';
+import 'package:elcaju/l10n/app_localizations.dart';
+import '../../core/constants/colors.dart';
+import '../../core/constants/dimensions.dart';
+import '../../core/utils/formatters.dart';
+import '../../src/rust/api/payment_request.dart';
+import '../../widgets/common/gradient_background.dart';
+import '../../widgets/common/glass_card.dart';
+import '../../widgets/common/primary_button.dart';
+import '../../providers/wallet_provider.dart';
+
+/// Pantalla de confirmación para pagar un Payment Request (NUT-18/26)
+class PaymentRequestScreen extends StatefulWidget {
+  /// Raw encoded payment request (creqA, CREQB1, or bitcoin:?creq=)
+  final String encodedRequest;
+
+  const PaymentRequestScreen({super.key, required this.encodedRequest});
+
+  @override
+  State<PaymentRequestScreen> createState() => _PaymentRequestScreenState();
+}
+
+class _PaymentRequestScreenState extends State<PaymentRequestScreen> {
+  PaymentRequestInfo? _info;
+  String? _parseError;
+  bool _isPaying = false;
+  String? _payError;
+
+  @override
+  void initState() {
+    super.initState();
+    _parseRequest();
+  }
+
+  void _parseRequest() {
+    try {
+      final info = PaymentRequestInfo.parse(encoded: widget.encodedRequest);
+      setState(() => _info = info);
+    } catch (e) {
+      setState(() => _parseError = e.toString());
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = L10n.of(context)!;
+
+    return GradientBackground(
+      child: Scaffold(
+        backgroundColor: Colors.transparent,
+        appBar: AppBar(
+          backgroundColor: Colors.transparent,
+          elevation: 0,
+          title: Text(
+            l10n.paymentRequestTitle,
+            style: const TextStyle(
+              fontFamily: 'Inter',
+              fontWeight: FontWeight.w600,
+            ),
+          ),
+          leading: IconButton(
+            icon: const Icon(LucideIcons.arrowLeft),
+            onPressed: () => Navigator.pop(context),
+          ),
+        ),
+        body: _parseError != null
+            ? _buildError(l10n)
+            : _info == null
+                ? const Center(child: CircularProgressIndicator())
+                : _buildContent(l10n),
+      ),
+    );
+  }
+
+  Widget _buildError(L10n l10n) {
+    return Center(
+      child: Padding(
+        padding: const EdgeInsets.all(AppDimensions.paddingLarge),
+        child: GlassCard(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Icon(LucideIcons.alertCircle, color: Colors.redAccent, size: 48),
+              const SizedBox(height: 16),
+              Text(
+                l10n.paymentRequestErrorParsing,
+                style: const TextStyle(
+                  fontFamily: 'Inter',
+                  fontSize: 16,
+                  fontWeight: FontWeight.w600,
+                  color: Colors.white,
+                ),
+                textAlign: TextAlign.center,
+              ),
+              const SizedBox(height: 8),
+              Text(
+                _parseError!,
+                style: TextStyle(
+                  fontFamily: 'Inter',
+                  fontSize: 13,
+                  color: Colors.white.withValues(alpha: 0.6),
+                ),
+                textAlign: TextAlign.center,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildContent(L10n l10n) {
+    final info = _info!;
+    final walletProvider = context.watch<WalletProvider>();
+    final activeUnit = walletProvider.activeUnit;
+    final requestUnit = info.unit ?? 'sat';
+
+    // Validaciones
+    final unitMismatch = info.unit != null && info.unit != activeUnit;
+    String stripSlash(String url) =>
+        url.endsWith('/') ? url.substring(0, url.length - 1) : url;
+    final normalizedMints = info.mints.map(stripSlash).toSet();
+    final activeMint = walletProvider.activeMintUrl;
+    final mintNotAccepted = normalizedMints.isNotEmpty &&
+        (activeMint == null || !normalizedMints.contains(stripSlash(activeMint)));
+    final hasTransport = info.transports.isNotEmpty;
+
+    return SingleChildScrollView(
+      padding: const EdgeInsets.all(AppDimensions.paddingLarge),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          // Monto
+          if (info.amount != null)
+            _buildAmountCard(info.amount!, requestUnit, l10n),
+
+          const SizedBox(height: 16),
+
+          // Detalles
+          GlassCard(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // Descripción
+                if (info.description != null && info.description!.isNotEmpty) ...[
+                  _buildDetailRow(
+                    LucideIcons.fileText,
+                    l10n.paymentRequestDescription,
+                    info.description!,
+                  ),
+                  const SizedBox(height: 12),
+                ],
+
+                // Mints aceptados
+                _buildDetailRow(
+                  LucideIcons.server,
+                  l10n.paymentRequestMints,
+                  info.mints.isEmpty
+                      ? l10n.paymentRequestAnyMint
+                      : info.mints.map((m) => Uri.parse(m).host).join(', '),
+                ),
+
+                // Transporte (solo mostrar si hay transporte configurado)
+                if (info.transports.isNotEmpty) ...[
+                  const SizedBox(height: 12),
+                  _buildDetailRow(
+                    LucideIcons.send,
+                    l10n.paymentRequestTransport,
+                    info.transports
+                        .map((t) => t.transportType == 'nostr' ? 'Nostr (NIP-17)' : 'HTTP POST')
+                        .join(', '),
+                  ),
+                ],
+              ],
+            ),
+          ),
+
+          const SizedBox(height: 16),
+
+          // Warnings
+          if (unitMismatch)
+            _buildWarning(
+              LucideIcons.alertTriangle,
+              l10n.paymentRequestUnitMismatch(requestUnit),
+            ),
+          if (mintNotAccepted)
+            _buildWarning(
+              LucideIcons.alertTriangle,
+              l10n.paymentRequestMintNotAccepted,
+            ),
+          if (!hasTransport)
+            _buildWarning(
+              LucideIcons.info,
+              l10n.paymentRequestNoTransport,
+            ),
+
+          if (_payError != null) ...[
+            const SizedBox(height: 12),
+            _buildWarning(LucideIcons.alertCircle, _payError!),
+          ],
+
+          const SizedBox(height: 32),
+
+          // Botón pagar
+          PrimaryButton(
+            text: _isPaying ? l10n.paymentRequestPaying : l10n.paymentRequestPay,
+            icon: LucideIcons.zap,
+            isLoading: _isPaying,
+            onPressed: (!hasTransport || _isPaying)
+                ? null
+                : _pay,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildAmountCard(BigInt amount, String unit, L10n l10n) {
+    return GlassCard(
+      child: Column(
+        children: [
+          Text(
+            l10n.paymentRequestAmount,
+            style: TextStyle(
+              fontFamily: 'Inter',
+              fontSize: 14,
+              color: Colors.white.withValues(alpha: 0.7),
+            ),
+          ),
+          const SizedBox(height: 8),
+          Text(
+            UnitFormatter.formatBalanceWithUnit(amount, unit),
+            style: const TextStyle(
+              fontFamily: 'Inter',
+              fontSize: 36,
+              fontWeight: FontWeight.w700,
+              color: Colors.white,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildDetailRow(IconData icon, String label, String value) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Icon(icon, size: 18, color: AppColors.primaryAction),
+        const SizedBox(width: 10),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                label,
+                style: TextStyle(
+                  fontFamily: 'Inter',
+                  fontSize: 12,
+                  fontWeight: FontWeight.w500,
+                  color: Colors.white.withValues(alpha: 0.6),
+                ),
+              ),
+              const SizedBox(height: 2),
+              Text(
+                value,
+                style: const TextStyle(
+                  fontFamily: 'Inter',
+                  fontSize: 14,
+                  color: Colors.white,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildWarning(IconData icon, String text) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 8),
+      child: GlassCard(
+        child: Row(
+          children: [
+            Icon(icon, size: 20, color: Colors.amber),
+            const SizedBox(width: 10),
+            Expanded(
+              child: Text(
+                text,
+                style: const TextStyle(
+                  fontFamily: 'Inter',
+                  fontSize: 13,
+                  color: Colors.amber,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<void> _pay() async {
+    setState(() {
+      _isPaying = true;
+      _payError = null;
+    });
+
+    try {
+      final walletProvider = context.read<WalletProvider>();
+      await walletProvider.payPaymentRequest(
+        widget.encodedRequest,
+        customAmount: _info!.amount,
+      );
+
+      if (!mounted) return;
+
+      // Éxito — mostrar snackbar y volver
+      final l10n = L10n.of(context)!;
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(l10n.paymentRequestSuccess),
+          backgroundColor: Colors.green.shade700,
+        ),
+      );
+      Navigator.pop(context, true);
+    } catch (e) {
+      if (!mounted) return;
+      setState(() {
+        _isPaying = false;
+        _payError = e.toString();
+      });
+    }
+  }
+}

lib/screens/12_request/request_screen.dart

@@ -0,0 +1,909 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+import 'package:lucide_icons/lucide_icons.dart';
+import 'package:share_plus/share_plus.dart';
+import '../../src/rust/api/wallet.dart';
+import '../../src/rust/api/payment_request.dart';
+import 'package:elcaju/l10n/app_localizations.dart';
+import '../../core/constants/colors.dart';
+import '../../core/constants/dimensions.dart';
+import '../../core/utils/formatters.dart';
+// TODO: re-enable once CDK fixes NIP-17 (cashubtc/cdk#1807)
+// import '../../core/utils/bip321_builder.dart';
+import '../../core/services/nfc_service.dart';
+import '../../widgets/common/gradient_background.dart';
+import '../../widgets/common/glass_card.dart';
+import '../../widgets/common/primary_button.dart';
+import '../../widgets/common/numpad_widget.dart';
+import '../../providers/wallet_provider.dart';
+
+enum RequestStatus { input, generating, waiting, received, error }
+enum QrMode { universal, cashu, lightning }
+
+/// Pantalla para solicitar pagos via Payment Request unificado.
+/// Genera creqB (Cashu/Nostr) + Lightning invoice en paralelo.
+class RequestScreen extends StatefulWidget {
+  const RequestScreen({super.key});
+
+  @override
+  State<RequestScreen> createState() => _RequestScreenState();
+}
+
+class _RequestScreenState extends State<RequestScreen> {
+  final TextEditingController _descriptionController = TextEditingController();
+
+  // Input state
+  String _amountValue = '';
+  late String _activeUnit;
+
+  // Request state
+  RequestStatus _status = RequestStatus.input;
+  String? _errorMessage;
+
+  // Payment data
+  String? _creqB;
+  String? _bolt11;
+  // TODO: re-enable QrMode.cashu / universal once CDK fixes NIP-17 sender pubkey bug
+  // See: https://github.com/cashubtc/cdk/issues/1807
+  // QrMode _activeMode = QrMode.lightning;
+  bool _paymentHandled = false;
+
+  // Listeners
+  StreamSubscription<NostrPaymentEvent>? _nostrSubscription;
+  StreamSubscription<MintQuote>? _mintSubscription;
+
+  // NFC
+  NfcState _nfcState = NfcState.unsupported;
+  bool _nfcEmulating = false;
+
+  // Success
+  BigInt _receivedAmount = BigInt.zero;
+
+  late final WalletProvider _walletProvider;
+
+  @override
+  void initState() {
+    super.initState();
+    _walletProvider = context.read<WalletProvider>();
+    _activeUnit = _walletProvider.activeUnit;
+    _checkNfc();
+  }
+
+  @override
+  void dispose() {
+    _descriptionController.dispose();
+    // TODO: re-enable once CDK fixes NIP-17 (cashubtc/cdk#1807)
+    // No-op while Nostr is disabled (_nostrSubscription is always null, _creqB is always null)
+    _nostrSubscription?.cancel();
+    _mintSubscription?.cancel();
+    if (_nfcEmulating) NfcService.stopEmulating();
+    if (!_paymentHandled && _creqB != null) {
+      _walletProvider.removePendingNostrRequest();
+    }
+    super.dispose();
+  }
+
+  Future<void> _checkNfc() async {
+    final state = await NfcService.checkState();
+    if (mounted) setState(() => _nfcState = state);
+  }
+
+  String get _unitLabel => UnitFormatter.getUnitLabel(_activeUnit);
+  BigInt get _amount => UnitFormatter.parseRawDigits(_amountValue, _activeUnit);
+  bool get _isValidAmount => _amount > BigInt.zero;
+
+  // ─── Build ───
+
+  @override
+  Widget build(BuildContext context) {
+    return GradientBackground(
+      child: Scaffold(
+        backgroundColor: Colors.transparent,
+        appBar: AppBar(
+          backgroundColor: Colors.transparent,
+          elevation: 0,
+          leading: IconButton(
+            icon: const Icon(LucideIcons.arrowLeft, color: Colors.white),
+            onPressed: () => Navigator.pop(context),
+          ),
+          title: Text(
+            L10n.of(context)!.requestPayment,
+            style: const TextStyle(
+              fontFamily: 'Inter',
+              fontWeight: FontWeight.w600,
+              color: Colors.white,
+            ),
+          ),
+          actions: [
+            if (_status == RequestStatus.waiting)
+              IconButton(
+                icon: const Icon(LucideIcons.share2, color: Colors.white),
+                onPressed: _shareRequest,
+              ),
+          ],
+        ),
+        body: SafeArea(child: _buildBody()),
+      ),
+    );
+  }
+
+  Widget _buildBody() {
+    switch (_status) {
+      case RequestStatus.input:
+        return _buildInputView();
+      case RequestStatus.generating:
+        return _buildGeneratingView();
+      case RequestStatus.waiting:
+        return _buildWaitingView();
+      case RequestStatus.received:
+        return _buildSuccessView();
+      case RequestStatus.error:
+        return _buildErrorView();
+    }
+  }
+
+  // ─── Input View ───
+
+  Widget _buildInputView() {
+    return Column(
+      children: [
+        Expanded(
+          child: SingleChildScrollView(
+            padding: const EdgeInsets.all(AppDimensions.paddingMedium),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                _buildAmountSection(),
+                const SizedBox(height: AppDimensions.paddingLarge),
+                _buildDescriptionSection(),
+                const SizedBox(height: AppDimensions.paddingMedium),
+                if (_errorMessage != null) _buildErrorMessage(),
+              ],
+            ),
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.all(AppDimensions.paddingMedium),
+          child: PrimaryButton(
+            text: L10n.of(context)!.generateRequest,
+            onPressed: _isValidAmount ? _generateRequest : null,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildAmountSection() {
+    final displayAmount =
+        UnitFormatter.formatRawDigitsForDisplay(_amountValue, _activeUnit);
+    return Column(
+      children: [
+        Text(
+          displayAmount,
+          style: TextStyle(
+            fontFamily: 'Inter',
+            fontSize: 48,
+            fontWeight: FontWeight.bold,
+            color: _isValidAmount || _amountValue.isEmpty
+                ? Colors.white
+                : AppColors.error,
+          ),
+        ),
+        const SizedBox(height: 4),
+        Text(
+          _unitLabel,
+          style: TextStyle(
+            fontFamily: 'Inter',
+            fontSize: 18,
+            color: AppColors.textSecondary,
+          ),
+        ),
+        const SizedBox(height: AppDimensions.paddingMedium),
+        NumpadWidget(
+          value: _amountValue,
+          onChanged: (v) => setState(() {
+            _errorMessage = null;
+            _amountValue = v;
+          }),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildDescriptionSection() {
+    final l10n = L10n.of(context)!;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          l10n.descriptionOptional,
+          style: TextStyle(
+            fontFamily: 'Inter',
+            fontSize: 16,
+            fontWeight: FontWeight.w500,
+            color: AppColors.textSecondary,
+          ),
+        ),
+        const SizedBox(height: AppDimensions.paddingSmall),
+        GlassCard(
+          padding: const EdgeInsets.all(AppDimensions.paddingSmall),
+          child: TextField(
+            controller: _descriptionController,
+            maxLines: 2,
+            maxLength: 100,
+            style: const TextStyle(
+              fontFamily: 'Inter',
+              fontSize: 16,
+              color: Colors.white,
+            ),
+            decoration: InputDecoration(
+              hintText: l10n.requestDescriptionHint,
+              hintStyle: TextStyle(
+                fontFamily: 'Inter',
+                fontSize: 16,
+                color: Colors.white.withValues(alpha: 0.3),
+              ),
+              border: InputBorder.none,
+              counterStyle: TextStyle(
+                fontFamily: 'Inter',
+                fontSize: 12,
+                color: AppColors.textSecondary.withValues(alpha: 0.5),
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildErrorMessage() {
+    return Container(
+      margin: const EdgeInsets.only(bottom: AppDimensions.paddingMedium),
+      padding: const EdgeInsets.all(AppDimensions.paddingMedium),
+      decoration: BoxDecoration(
+        color: AppColors.error.withValues(alpha: 0.15),
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(
+          color: AppColors.error.withValues(alpha: 0.3),
+          width: 1,
+        ),
+      ),
+      child: Row(
+        children: [
+          Icon(LucideIcons.alertCircle, color: AppColors.error, size: 20),
+          const SizedBox(width: 8),
+          Expanded(
+            child: Text(
+              _errorMessage!,
+              style: TextStyle(
+                fontFamily: 'Inter',
+                fontSize: 14,
+                color: AppColors.error,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  // ─── Generating View ───
+
+  Widget _buildGeneratingView() {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          const CircularProgressIndicator(color: AppColors.primaryAction),
+          const SizedBox(height: AppDimensions.paddingMedium),
+          Text(
+            L10n.of(context)!.generatingRequest,
+            style: const TextStyle(
+              fontFamily: 'Inter',
+              fontSize: 16,
+              color: AppColors.textSecondary,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  // ─── Waiting View (QR + sub-toggle + actions) ───
+
+  Widget _buildWaitingView() {
+    final l10n = L10n.of(context)!;
+    final formattedAmount = UnitFormatter.formatBalance(_amount, _activeUnit);
+
+    return Column(
+      children: [
+        Expanded(
+          child: SingleChildScrollView(
+            padding: const EdgeInsets.all(AppDimensions.paddingMedium),
+            child: Column(
+              children: [
+                // Amount header
+                Text(
+                  '$formattedAmount $_unitLabel',
+                  style: const TextStyle(
+                    fontFamily: 'Inter',
+                    fontSize: 28,
+                    fontWeight: FontWeight.bold,
+                    color: Colors.white,
+                  ),
+                ),
+                const SizedBox(height: AppDimensions.paddingLarge),
+
+                // QR Code with logo overlay
+                Center(
+                  child: Container(
+                    padding: const EdgeInsets.all(16),
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.circular(16),
+                    ),
+                    child: Stack(
+                      alignment: Alignment.center,
+                      children: [
+                        QrImageView(
+                          data: _getActiveQrContent(),
+                          version: QrVersions.auto,
+                          size: 260,
+                          backgroundColor: Colors.white,
+                          // TODO: use QrErrorCorrectLevel.M for universal mode once CDK fixes NIP-17 (cashubtc/cdk#1807)
+                          errorCorrectionLevel: QrErrorCorrectLevel.H,
+                        ),
+                        // TODO: re-enable Cashu logo overlay once CDK fixes NIP-17 (cashubtc/cdk#1807)
+                        // if (_activeMode == QrMode.cashu)
+                        //   Container(
+                        //     width: 48, height: 48,
+                        //     decoration: BoxDecoration(
+                        //       color: Colors.white,
+                        //       borderRadius: BorderRadius.circular(10),
+                        //       border: Border.all(color: Colors.white, width: 4),
+                        //     ),
+                        //     child: ClipRRect(
+                        //       borderRadius: BorderRadius.circular(6),
+                        //       child: Image.asset('assets/img/cashu.png', fit: BoxFit.contain),
+                        //     ),
+                        //   ),
+                        Container(
+                          width: 48,
+                          height: 48,
+                          decoration: BoxDecoration(
+                            color: AppColors.bitcoinOrange,
+                            borderRadius: BorderRadius.circular(10),
+                            border: Border.all(color: Colors.white, width: 4),
+                          ),
+                          child: const Icon(
+                            LucideIcons.zap,
+                            color: Colors.white,
+                            size: 28,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+                const SizedBox(height: AppDimensions.paddingMedium),
+
+                // Sub-toggle: Universal / Cashu / Lightning
+                _buildModeToggle(),
+                const SizedBox(height: AppDimensions.paddingMedium),
+
+                // Action buttons: Copy, NFC, Share
+                _buildActionButtons(),
+                const SizedBox(height: AppDimensions.paddingMedium),
+
+                // Status indicator
+                _buildStatusIndicator(),
+              ],
+            ),
+          ),
+        ),
+
+        // Cancel button
+        Padding(
+          padding: const EdgeInsets.all(AppDimensions.paddingMedium),
+          child: GestureDetector(
+            onTap: () => Navigator.pop(context),
+            child: Container(
+              width: double.infinity,
+              padding: const EdgeInsets.symmetric(vertical: 16),
+              decoration: BoxDecoration(
+                color: Colors.white.withValues(alpha: 0.1),
+                borderRadius: BorderRadius.circular(16),
+              ),
+              child: Center(
+                child: Text(
+                  l10n.cancel,
+                  style: const TextStyle(
+                    fontFamily: 'Inter',
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                    color: Colors.white,
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildModeToggle() {
+    // TODO: re-enable Universal/Cashu tabs once CDK fixes NIP-17 (cashubtc/cdk#1807)
+    // Hidden while only Lightning is available (single button toggle is a no-op)
+    return const SizedBox.shrink(
+      // child: Container(
+      //   padding: const EdgeInsets.all(4),
+      //   decoration: BoxDecoration(
+      //     color: Colors.white.withValues(alpha: 0.1),
+      //     borderRadius: BorderRadius.circular(12),
+      //   ),
+      //   child: Row(
+      //     children: [
+      //       _buildToggleButton(label: L10n.of(context)!.universal, mode: QrMode.universal, enabled: _bolt11 != null),
+      //       _buildToggleButton(label: 'Cashu', mode: QrMode.cashu, enabled: true),
+      //       _buildToggleButton(label: 'Lightning', mode: QrMode.lightning, enabled: _bolt11 != null),
+      //     ],
+      //   ),
+      // ),
+    );
+  }
+
+  // TODO: re-enable once CDK fixes NIP-17 (cashubtc/cdk#1807)
+  // Widget _buildToggleButton({
+  //   required String label,
+  //   required QrMode mode,
+  //   required bool enabled,
+  // }) {
+  //   final isActive = _activeMode == mode;
+  //   return Expanded(
+  //     child: GestureDetector(
+  //       onTap: enabled
+  //           ? () {
+  //               setState(() => _activeMode = mode);
+  //               _updateNfcPayload();
+  //             }
+  //           : null,
+  //       child: Container(
+  //         padding: const EdgeInsets.symmetric(vertical: 10),
+  //         decoration: BoxDecoration(
+  //           gradient: isActive
+  //               ? const LinearGradient(colors: AppColors.buttonGradient)
+  //               : null,
+  //           borderRadius: BorderRadius.circular(10),
+  //         ),
+  //         child: Center(
+  //           child: Text(
+  //             label,
+  //             style: TextStyle(
+  //               fontFamily: 'Inter',
+  //               fontSize: 13,
+  //               fontWeight: isActive ? FontWeight.w600 : FontWeight.w400,
+  //               color: enabled
+  //                   ? (isActive ? Colors.white : AppColors.textSecondary)
+  //                   : Colors.white.withValues(alpha: 0.3),
+  //             ),
+  //           ),
+  //         ),
+  //       ),
+  //     ),
+  //   );
+  // }
+
+  Widget _buildActionButtons() {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        _buildActionButton(
+          icon: LucideIcons.copy,
+          label: L10n.of(context)!.copy,
+          onTap: _copyRequest,
+        ),
+        if (_nfcState == NfcState.enabled) ...[
+          const SizedBox(width: 16),
+          _buildActionButton(
+            icon: _nfcEmulating ? LucideIcons.wifiOff : LucideIcons.wifi,
+            label: 'NFC',
+            onTap: _toggleNfc,
+            active: _nfcEmulating,
+          ),
+        ],
+        const SizedBox(width: 16),
+        _buildActionButton(
+          icon: LucideIcons.share2,
+          label: L10n.of(context)!.share,
+          onTap: _shareRequest,
+        ),
+      ],
+    );
+  }
+
+  Widget _buildActionButton({
+    required IconData icon,
+    required String label,
+    required VoidCallback onTap,
+    bool active = false,
+  }) {
+    return GestureDetector(
+      onTap: onTap,
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
+        decoration: BoxDecoration(
+          color: active
+              ? AppColors.primaryAction.withValues(alpha: 0.2)
+              : Colors.white.withValues(alpha: 0.1),
+          borderRadius: BorderRadius.circular(12),
+          border: active
+              ? Border.all(color: AppColors.primaryAction.withValues(alpha: 0.5))
+              : null,
+        ),
+        child: Row(
+          children: [
+            Icon(icon, color: active ? AppColors.primaryAction : AppColors.textSecondary, size: 18),
+            const SizedBox(width: 6),
+            Text(
+              label,
+              style: TextStyle(
+                fontFamily: 'Inter',
+                fontSize: 14,
+                color: active ? AppColors.primaryAction : AppColors.textSecondary,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStatusIndicator() {
+    return GlassCard(
+      padding: const EdgeInsets.all(AppDimensions.paddingMedium),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          SizedBox(
+            width: 20,
+            height: 20,
+            child: CircularProgressIndicator(
+              strokeWidth: 2,
+              valueColor: AlwaysStoppedAnimation<Color>(AppColors.textSecondary),
+            ),
+          ),
+          const SizedBox(width: 12),
+          Text(
+            L10n.of(context)!.waitingForPayment,
+            style: TextStyle(
+              fontFamily: 'Inter',
+              fontSize: 16,
+              fontWeight: FontWeight.w600,
+              color: AppColors.textSecondary,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  // ─── Success View ───
+
+  Widget _buildSuccessView() {
+    final l10n = L10n.of(context)!;
+    final formattedAmount =
+        '+${UnitFormatter.formatBalance(_receivedAmount, _activeUnit)}';
+    final unitLabel = UnitFormatter.getUnitLabel(_activeUnit);
+
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Container(
+            width: 80,
+            height: 80,
+            decoration: BoxDecoration(
+              color: AppColors.success.withValues(alpha: 0.2),
+              shape: BoxShape.circle,
+            ),
+            child: const Icon(
+              LucideIcons.checkCircle2,
+              color: AppColors.success,
+              size: 40,
+            ),
+          ),
+          const SizedBox(height: AppDimensions.paddingMedium),
+          Text(
+            '$formattedAmount $unitLabel',
+            style: const TextStyle(
+              fontFamily: 'Inter',
+              fontSize: 32,
+              fontWeight: FontWeight.bold,
+              color: Colors.white,
+            ),
+          ),
+          const SizedBox(height: AppDimensions.paddingSmall),
+          Text(
+            l10n.requestPaymentReceived,
+            style: TextStyle(
+              fontFamily: 'Inter',
+              fontSize: 16,
+              color: AppColors.textSecondary,
+            ),
+          ),
+          const SizedBox(height: AppDimensions.paddingLarge * 2),
+          PrimaryButton(
+            text: l10n.backToHome,
+            onPressed: () =>
+                Navigator.popUntil(context, (route) => route.isFirst),
+          ),
+        ],
+      ),
+    );
+  }
+
+  // ─── Error View ───
+
+  Widget _buildErrorView() {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Container(
+            width: 80,
+            height: 80,
+            decoration: BoxDecoration(
+              color: AppColors.error.withValues(alpha: 0.2),
+              shape: BoxShape.circle,
+            ),
+            child: const Icon(
+              LucideIcons.alertCircle,
+              color: AppColors.error,
+              size: 40,
+            ),
+          ),
+          const SizedBox(height: AppDimensions.paddingMedium),
+          Text(
+            L10n.of(context)!.error,
+            style: const TextStyle(
+              fontFamily: 'Inter',
+              fontSize: 20,
+              fontWeight: FontWeight.bold,
+              color: Colors.white,
+            ),
+          ),
+          const SizedBox(height: AppDimensions.paddingSmall),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 32),
+            child: Text(
+              _errorMessage ?? L10n.of(context)!.unknownError,
+              style: TextStyle(
+                fontFamily: 'Inter',
+                fontSize: 14,
+                color: AppColors.textSecondary.withValues(alpha: 0.7),
+              ),
+              textAlign: TextAlign.center,
+            ),
+          ),
+          const SizedBox(height: AppDimensions.paddingLarge),
+          PrimaryButton(
+            text: L10n.of(context)!.back,
+            onPressed: () => setState(() {
+              _status = RequestStatus.input;
+              _errorMessage = null;
+            }),
+          ),
+        ],
+      ),
+    );
+  }
+
+  // ─── Logic ───
+
+  // TODO: re-enable once CDK fixes NIP-17 (cashubtc/cdk#1807)
+  // static const List<String> _defaultNostrRelays = [
+  //   'wss://relay.damus.io',
+  //   'wss://relay.primal.net',
+  //   'wss://nos.lol',
+  // ];
+
+  Future<void> _generateRequest() async {
+    final walletProvider = context.read<WalletProvider>();
+    final wallet = walletProvider.activeWallet;
+
+    // Clean up previous request state — await to ensure Rust locks are released
+    await _nostrSubscription?.cancel();
+    _nostrSubscription = null;
+    await _mintSubscription?.cancel();
+    _mintSubscription = null;
+    if (_nfcEmulating) {
+      NfcService.stopEmulating();
+      _nfcEmulating = false;
+    }
+    _paymentHandled = false;
+    _creqB = null;
+    _bolt11 = null;
+    // TODO: re-enable Cashu/Nostr payment request once CDK fixes NIP-17 sender pubkey bug
+    // See: https://github.com/cashubtc/cdk/issues/1807
+    // _activeMode = QrMode.lightning;
+
+    setState(() => _status = RequestStatus.generating);
+
+    if (wallet == null) {
+      setState(() {
+        _status = RequestStatus.error;
+        _errorMessage = 'No active wallet';
+      });
+      return;
+    }
+
+    try {
+      final description = _descriptionController.text.isNotEmpty
+          ? _descriptionController.text
+          : null;
+
+      // TODO: re-enable once CDK fixes NIP-17 (cashubtc/cdk#1807)
+      // // 1. Create payment request (creqB + Nostr keys)
+      // final request = await wallet.createPaymentRequest(
+      //   params: CreateRequestParams(
+      //     amount: _amount,
+      //     unit: _activeUnit,
+      //     description: description,
+      //     nostrRelays: _defaultNostrRelays,
+      //   ),
+      // );
+      //
+      // _creqB = request.creqB;
+      //
+      // // Persist handle for recovery if app is killed
+      // await walletProvider.savePendingNostrRequest(
+      //   request.listenerHandle.toPersisted(),
+      // );
+      //
+      // // 2. Start Nostr listener
+      // _nostrSubscription = wallet
+      //     .waitForNostrPayment(handle: request.listenerHandle)
+      //     .listen(_onNostrEvent);
+
+      // Lightning invoice generation via wallet provider
+      // (walletProvider.mintTokens handles pending invoice persistence and metadata)
+      final mintStream = await walletProvider.mintTokens(
+        _amount,
+        description,
+      );
+      if (!mounted) return;
+      _mintSubscription = mintStream.listen(_onMintEvent);
+    } catch (e) {
+      if (!mounted) return;
+      setState(() {
+        _status = RequestStatus.error;
+        _errorMessage = e.toString();
+      });
+    }
+  }
+
+  // TODO: re-enable once CDK fixes NIP-17 (cashubtc/cdk#1807)
+  // void _onNostrEvent(NostrPaymentEvent event) {
+  //   if (!mounted || _paymentHandled) return;
+  //   if (event.state == NostrPaymentState.received) {
+  //     _paymentHandled = true;
+  //     _mintSubscription?.cancel();
+  //     _onPaymentSuccess(event.amount ?? _amount);
+  //   }
+  // }
+
+  void _onMintEvent(MintQuote quote) {
+    if (!mounted) return;
+    switch (quote.state) {
+      case MintQuoteState.unpaid:
+        if (_bolt11 == null) {
+          setState(() {
+            _bolt11 = quote.request;
+            // TODO: switch to QrMode.universal once CDK fixes NIP-17 (cashubtc/cdk#1807)
+            // _activeMode = QrMode.lightning;
+            _status = RequestStatus.waiting;
+          });
+          _updateNfcPayload();
+        }
+        break;
+      case MintQuoteState.issued:
+        if (!_paymentHandled) {
+          _paymentHandled = true;
+          _nostrSubscription?.cancel();
+          _onPaymentSuccess(quote.amount ?? _amount);
+        }
+        break;
+      case MintQuoteState.error:
+        // No Nostr fallback while CDK NIP-17 bug is open (cashubtc/cdk#1807)
+        if (!_paymentHandled) {
+          if (_nfcEmulating) {
+            NfcService.stopEmulating();
+            _nfcEmulating = false;
+          }
+          setState(() {
+            _status = RequestStatus.error;
+            _errorMessage = quote.error ?? L10n.of(context)!.unknownError;
+          });
+        }
+        break;
+      default:
+        break;
+    }
+  }
+
+  Future<void> _onPaymentSuccess(BigInt amount) async {
+    if (_nfcEmulating) NfcService.stopEmulating();
+    setState(() {
+      _status = RequestStatus.received;
+      _receivedAmount = amount;
+    });
+    final walletProvider = context.read<WalletProvider>();
+    walletProvider.confettiController.fire();
+    // TODO: re-enable once CDK fixes NIP-17 (cashubtc/cdk#1807)
+    // Only remove pending Nostr request if this screen created one.
+    // Disabled while Nostr payment requests are disabled to avoid
+    // deleting a recovery record from a previous session.
+    // await walletProvider.removePendingNostrRequest();
+  }
+
+  // ─── QR Content ───
+
+  String _getActiveQrContent() {
+    // TODO: re-enable once CDK fixes NIP-17 (cashubtc/cdk#1807)
+    // case QrMode.universal:
+    //   return buildUnifiedUri(creqB: _creqB!, bolt11: _bolt11);
+    // case QrMode.cashu:
+    //   return _creqB!.toUpperCase();
+    return _bolt11?.toUpperCase() ?? '';
+  }
+
+  // ─── Actions ───
+
+  Future<void> _copyRequest() async {
+    final content = _getActiveQrContent();
+    await Clipboard.setData(ClipboardData(text: content));
+    if (mounted) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(L10n.of(context)!.copiedToClipboard),
+          backgroundColor: AppColors.success,
+          duration: const Duration(seconds: 2),
+        ),
+      );
+    }
+  }
+
+  void _toggleNfc() {
+    if (_nfcEmulating) {
+      NfcService.stopEmulating();
+      setState(() => _nfcEmulating = false);
+    } else {
+      NfcService.startEmulating(_getActiveQrContent());
+      setState(() => _nfcEmulating = true);
+    }
+  }
+
+  void _updateNfcPayload() {
+    if (_nfcEmulating) {
+      NfcService.startEmulating(_getActiveQrContent());
+    }
+  }
+
+  void _shareRequest() async {
+    final content = _getActiveQrContent();
+    final formattedAmount =
+        UnitFormatter.formatBalance(_amount, _activeUnit);
+    final unitLabel = UnitFormatter.getUnitLabel(_activeUnit);
+
+    await SharePlus.instance.share(
+      ShareParams(
+        text: '$formattedAmount $unitLabel\n\n$content',
+        subject: 'Payment Request - $formattedAmount $unitLabel',
+      ),
+    );
+  }
+}

lib/screens/3_home/home_screen.dart

@@ -11,9 +11,10 @@ import '../../widgets/common/glass_card.dart';
 import '../../widgets/common/animated_action_button.dart';
 import '../../providers/wallet_provider.dart';
 import '../../providers/settings_provider.dart';
+import '../../providers/p2pk_provider.dart';
 import '../4_receive/receive_screen.dart';
 import '../5_send/send_screen.dart';
-import '../6_mint/mint_screen.dart';
+import '../12_request/request_screen.dart';
 import '../7_melt/melt_screen.dart';
 import '../8_settings/settings_screen.dart';
 import '../8_settings/mints_screen.dart';
@@ -51,7 +52,10 @@ class _HomeScreenState extends State<HomeScreen> {
     if (!walletProvider.hasPendingTokens) return;
 
     try {
-      final result = await walletProvider.checkPendingTokens();
+      final p2pkProvider = context.read<P2PKProvider>();
+      final result = await walletProvider.checkPendingTokens(
+        p2pkKeyResolver: p2pkProvider.getPrivateKeyForToken,
+      );
       final claimed = (result['claimed'] as int?) ?? 0;
       final totalClaimed = result['totalClaimed'] as BigInt? ?? BigInt.zero;
       final unit = (result['unit'] as String?) ?? walletProvider.activeUnit;
@@ -433,14 +437,14 @@ class _HomeScreenState extends State<HomeScreen> {
             },
           ),
           _MethodOption(
-            icon: LucideIcons.zap,
-            label: l10n.lightning,
-            description: l10n.generateInvoiceToDeposit,
+            icon: LucideIcons.bellRing,
+            label: l10n.request,
+            description: l10n.requestPaymentDescription,
             onTap: () {
               Navigator.pop(context);
               Navigator.push(
                 context,
-                MaterialPageRoute(builder: (context) => const MintScreen()),
+                MaterialPageRoute(builder: (context) => const RequestScreen()),
               );
             },
           ),

lib/screens/4_receive/receive_screen.dart

@@ -16,6 +16,7 @@ import '../../widgets/common/primary_button.dart';
 import '../../providers/wallet_provider.dart';
 import '../../providers/p2pk_provider.dart';
 import '../10_scanner/scan_screen.dart';
+import '../11_payment_request/payment_request_screen.dart';
 
 /// Pantalla para recibir tokens Cashu
 class ReceiveScreen extends StatefulWidget {
@@ -993,6 +994,25 @@ class _ReceiveScreenState extends State<ReceiveScreen> {
         return;
       }
 
+      // Detectar payment request y redirigir
+      final parsed = IncomingDataParser.parse(tokenValue);
+      if (parsed.type == IncomingDataType.paymentRequest) {
+        _isValidToken = false;
+        _tokenInfo = null;
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (!mounted) return;
+          Navigator.pushReplacement(
+            context,
+            MaterialPageRoute(
+              builder: (context) => PaymentRequestScreen(
+                encodedRequest: tokenValue,
+              ),
+            ),
+          );
+        });
+        return;
+      }
+
       // Parsear token real con cdk-flutter
       final tokenInfo = walletProvider.parseToken(tokenValue);
 

lib/screens/5_send/offline_send_screen.dart

@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:lucide_icons/lucide_icons.dart';
 import 'package:elcaju/l10n/app_localizations.dart';
@@ -5,6 +6,7 @@ import '../../core/constants/colors.dart';
 import '../../core/constants/dimensions.dart';
 import '../../core/models/proof.dart';
 import '../../core/services/proof_service.dart';
+import '../../src/rust/api/token.dart' as cdk;
 import '../../widgets/common/gradient_background.dart';
 import '../../widgets/common/glass_card.dart';
 import '../../widgets/common/primary_button.dart';
@@ -45,7 +47,7 @@ class _OfflineSendScreenState extends State<OfflineSendScreen> {
   @override
   void dispose() {
     _memoController.dispose();
-    _proofService.close();
+    if (!_isCreating) _proofService.close();
     super.dispose();
   }
 
@@ -321,32 +323,40 @@ class _OfflineSendScreenState extends State<OfflineSendScreen> {
   }
 
   Future<void> _createOfflineToken() async {
+    final selectedProofs = _selectedProofs;
+    final selectedTotal = _proofService.calculateTotal(selectedProofs);
+    var proofsMarkedPending = false;
+
     setState(() {
       _isCreating = true;
     });
 
     try {
-      final selectedProofs = _selectedProofs;
-
       // Marcar proofs como PENDING_SPENT
       await _proofService.markProofsPendingSpent(selectedProofs);
+      proofsMarkedPending = true;
 
-      // Crear token V3
+      // Crear token via CDK (produce V4/cashuB válido)
       final memo = _memoController.text.isNotEmpty ? _memoController.text : null;
-      final token = _proofService.createTokenV3(
+      final proofsJson = jsonEncode(
+        selectedProofs.map((p) => p.toTokenProof()).toList(),
+      );
+      final cdkToken = cdk.createOfflineToken(
         mintUrl: widget.mintUrl,
-        proofs: selectedProofs,
+        proofsJson: proofsJson,
         memo: memo,
         unit: widget.unit,
       );
+      final token = cdkToken.encoded;
 
       if (mounted) {
+        _isCreating = false;
         Navigator.pushReplacement(
           context,
           MaterialPageRoute(
             builder: (context) => ShareTokenScreen(
               token: token,
-              amount: _selectedTotal,
+              amount: selectedTotal,
               unit: widget.unit,
               memo: memo,
             ),
@@ -354,7 +364,17 @@ class _OfflineSendScreenState extends State<OfflineSendScreen> {
         );
       }
     } catch (e) {
-      if (!mounted) return;
+      if (proofsMarkedPending) {
+        try {
+          await _proofService.markProofsUnspent(selectedProofs);
+        } catch (rollbackErr) {
+          debugPrint('Failed to rollback proofs to UNSPENT: $rollbackErr');
+        }
+      }
+      if (!mounted) {
+        _proofService.close();
+        return;
+      }
       final errorMessage = L10n.of(context)!.creatingTokenError(e.toString());
       setState(() {
         _errorMessage = errorMessage;

lib/screens/5_send/send_screen.dart

@@ -581,6 +581,7 @@ class _SendScreenState extends State<SendScreen> {
     showModalBottomSheet(
       context: context,
       backgroundColor: Colors.transparent,
+      isScrollControlled: true,
       builder: (context) => _ConfirmationModal(
         amount: _amount,
         unit: _activeUnit,

lib/screens/5_send/share_token_screen.dart

@@ -72,8 +72,13 @@ class _ShareTokenScreenState extends State<ShareTokenScreen> {
   }
 
   void _encodeTokenToUR() {
-    // Parsear el token string a objeto Token de cdk-flutter
-    final token = cdk.Token.parse(encoded: widget.token);
+    // Construir Token directamente sin Token.parse para evitar validación
+    // estricta de keyset IDs. encodeQrToken solo usa token.encoded.
+    final token = cdk.Token(
+      encoded: widget.token,
+      amount: widget.amount,
+      mintUrl: '',
+    );
 
     // Codificar a fragmentos UR usando cdk-flutter
     // maxFragmentLength por defecto es 150 bytes

lib/screens/6_mint/invoice_screen.dart

@@ -80,10 +80,9 @@ class _InvoiceScreenState extends State<InvoiceScreen> {
                 _onMintCompleted();
                 break;
 
-              default:
-                // Cualquier otro estado se trata como error
+              case MintQuoteState.error:
                 _status = MintStatus.error;
-                _errorMessage = L10n.of(context)!.unknownState;
+                _errorMessage = quote.error ?? L10n.of(context)!.unknownError;
             }
           });
         },

lib/screens/6_mint/mint_screen.dart

@@ -249,6 +249,7 @@ class _MintScreenState extends State<MintScreen> {
     showModalBottomSheet(
       context: context,
       backgroundColor: Colors.transparent,
+      isScrollControlled: true,
       builder: (context) => _ConfirmationModal(
         amount: _amount,
         unit: _activeUnit,

lib/screens/7_melt/melt_screen.dart

@@ -594,15 +594,28 @@ class _MeltScreenState extends State<MeltScreen> {
       }
     });
 
+    // Extract lightning invoice from BIP-321 URI if present
+    var inputValue = value;
+    if (value.trim().toLowerCase().startsWith('bitcoin:')) {
+      final parsed = IncomingDataParser.parse(value.trim());
+      if (parsed.invoiceBolt11 != null) {
+        inputValue = parsed.invoiceBolt11!;
+        _invoiceController.text = inputValue;
+        _invoiceController.selection = TextSelection.fromPosition(
+          TextPosition(offset: inputValue.length),
+        );
+      }
+    }
+
     // Detectar tipo de input (sin mostrar error, solo detectar)
-    final inputType = LnurlService.detectType(value);
+    final inputType = LnurlService.detectType(inputValue);
     setState(() => _inputType = inputType);
 
     // Solo procesar automáticamente invoices BOLT11
     // LNURL y Lightning Address requieren botón explícito
     if (inputType == LnInputType.bolt11Invoice) {
       // BOLT11 invoices son 200+ chars; evitar llamar API con input parcial
-      final cleaned = LnurlService.cleanInput(value);
+      final cleaned = LnurlService.cleanInput(inputValue);
       if (cleaned.length > 50) {
         _getQuote(cleaned);
       }

lib/screens/9_history/history_screen.dart

@@ -14,6 +14,8 @@ import '../../core/utils/formatters.dart';
 import '../../data/transaction_meta_storage.dart';
 import '../../data/pending_token.dart';
 import '../../providers/wallet_provider.dart';
+import '../../providers/p2pk_provider.dart';
+import '../../core/utils/p2pk_utils.dart';
 import '../../widgets/common/gradient_background.dart';
 
 /// Filtros disponibles para el historial
@@ -222,9 +224,16 @@ class _HistoryScreenState extends State<HistoryScreen> {
   Future<void> _claimPendingToken(PendingToken token) async {
     final l10n = L10n.of(context)!;
     final walletProvider = context.read<WalletProvider>();
+    final p2pkProvider = context.read<P2PKProvider>();
 
     try {
-      final amount = await walletProvider.claimPendingToken(token.id);
+      // Detectar P2PK y obtener clave privada si es necesario
+      String? p2pkKey;
+      if (P2PKUtils.isP2PKLocked(token.encoded)) {
+        p2pkKey = p2pkProvider.getPrivateKeyForToken(token.encoded);
+      }
+
+      final amount = await walletProvider.claimPendingToken(token.id, p2pkPrivateKey: p2pkKey);
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(

lib/src/rust/api/payment_request.dart

@@ -0,0 +1,251 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.11.1.
+
+// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
+
+import '../frb_generated.dart';
+import 'error.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+
+// These functions are ignored because they are not marked as `pub`: `extract_creq_from_uri`, `parse_payment_request_inner`, `percent_decode`, `wait_for_nostr_payment_inner`
+// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `clone`
+
+// Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<CreatedPaymentRequest>>
+abstract class CreatedPaymentRequest implements RustOpaqueInterface {
+  String get creqA;
+
+  String get creqB;
+
+  NostrListenerHandle get listenerHandle;
+
+  set creqA(String creqA);
+
+  set creqB(String creqB);
+
+  set listenerHandle(NostrListenerHandle listenerHandle);
+}
+
+// Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<NostrListenerHandle>>
+abstract class NostrListenerHandle implements RustOpaqueInterface {
+  /// Reconstruct a handle from persisted data (e.g. after app restart).
+  static NostrListenerHandle fromPersisted({
+    required PersistedRequestData data,
+  }) => RustLib.instance.api
+      .crateApiPaymentRequestNostrListenerHandleFromPersisted(data: data);
+
+  /// Export handle data for persistence (e.g. SharedPreferences).
+  /// The secret key is exposed as hex — the caller is responsible
+  /// for storing it securely.
+  PersistedRequestData toPersisted();
+}
+
+/// Parameters for creating a payment request.
+class CreateRequestParams {
+  /// Amount to request (in smallest unit, e.g. sats)
+  final BigInt? amount;
+
+  /// Currency unit ("sat", "usd", etc.)
+  final String unit;
+
+  /// Human-readable description
+  final String? description;
+
+  /// Nostr relay URLs for the transport
+  final List<String> nostrRelays;
+
+  const CreateRequestParams({
+    this.amount,
+    required this.unit,
+    this.description,
+    required this.nostrRelays,
+  });
+
+  @override
+  int get hashCode =>
+      amount.hashCode ^
+      unit.hashCode ^
+      description.hashCode ^
+      nostrRelays.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is CreateRequestParams &&
+          runtimeType == other.runtimeType &&
+          amount == other.amount &&
+          unit == other.unit &&
+          description == other.description &&
+          nostrRelays == other.nostrRelays;
+}
+
+/// Event emitted by the Nostr payment listener.
+class NostrPaymentEvent {
+  final NostrPaymentState state;
+  final BigInt? amount;
+  final String? error;
+
+  const NostrPaymentEvent({required this.state, this.amount, this.error});
+
+  @override
+  int get hashCode => state.hashCode ^ amount.hashCode ^ error.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is NostrPaymentEvent &&
+          runtimeType == other.runtimeType &&
+          state == other.state &&
+          amount == other.amount &&
+          error == other.error;
+}
+
+/// State of a Nostr payment listener.
+enum NostrPaymentState {
+  /// Connected to relays, waiting for payment
+  waiting,
+
+  /// Payment received and tokens claimed
+  received,
+
+  /// Error occurred
+  error,
+}
+
+/// Parsed payment request info exposed to Flutter.
+/// CDK's FromStr auto-detects creqA (CBOR) vs creqB (Bech32m).
+class PaymentRequestInfo {
+  /// Raw encoded string (creqA... or CREQB1...)
+  final String raw;
+
+  /// Payment id
+  final String? paymentId;
+
+  /// Requested amount (in base unit)
+  final BigInt? amount;
+
+  /// Currency unit ("sat", "usd", etc.)
+  final String? unit;
+
+  /// Whether this is a single-use request
+  final bool? singleUse;
+
+  /// Accepted mints (empty = any mint)
+  final List<String> mints;
+
+  /// Human-readable description
+  final String? description;
+
+  /// Available transports
+  final List<TransportInfo> transports;
+
+  /// Whether NUT-10 spending conditions are required
+  final bool hasNut10;
+
+  const PaymentRequestInfo({
+    required this.raw,
+    this.paymentId,
+    this.amount,
+    this.unit,
+    this.singleUse,
+    required this.mints,
+    this.description,
+    required this.transports,
+    required this.hasNut10,
+  });
+
+  /// Parse a payment request string (creqA, CREQB1, or bitcoin:?creq=).
+  /// Supports NUT-18 (CBOR+base64) and NUT-26 (Bech32m) automatically.
+  static PaymentRequestInfo parse({required String encoded}) => RustLib
+      .instance
+      .api
+      .crateApiPaymentRequestPaymentRequestInfoParse(encoded: encoded);
+
+  @override
+  int get hashCode =>
+      raw.hashCode ^
+      paymentId.hashCode ^
+      amount.hashCode ^
+      unit.hashCode ^
+      singleUse.hashCode ^
+      mints.hashCode ^
+      description.hashCode ^
+      transports.hashCode ^
+      hasNut10.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is PaymentRequestInfo &&
+          runtimeType == other.runtimeType &&
+          raw == other.raw &&
+          paymentId == other.paymentId &&
+          amount == other.amount &&
+          unit == other.unit &&
+          singleUse == other.singleUse &&
+          mints == other.mints &&
+          description == other.description &&
+          transports == other.transports &&
+          hasNut10 == other.hasNut10;
+}
+
+/// Serializable data for persisting a NostrListenerHandle across app restarts.
+class PersistedRequestData {
+  final String secretHex;
+  final String pubkeyHex;
+  final List<String> relays;
+  final BigInt? amount;
+  final String unit;
+  final String mintUrl;
+
+  const PersistedRequestData({
+    required this.secretHex,
+    required this.pubkeyHex,
+    required this.relays,
+    this.amount,
+    required this.unit,
+    required this.mintUrl,
+  });
+
+  @override
+  int get hashCode =>
+      secretHex.hashCode ^
+      pubkeyHex.hashCode ^
+      relays.hashCode ^
+      amount.hashCode ^
+      unit.hashCode ^
+      mintUrl.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is PersistedRequestData &&
+          runtimeType == other.runtimeType &&
+          secretHex == other.secretHex &&
+          pubkeyHex == other.pubkeyHex &&
+          relays == other.relays &&
+          amount == other.amount &&
+          unit == other.unit &&
+          mintUrl == other.mintUrl;
+}
+
+/// Transport info exposed to Flutter
+class TransportInfo {
+  /// "nostr" or "post"
+  final String transportType;
+
+  /// Target (nprofile or URL)
+  final String target;
+
+  const TransportInfo({required this.transportType, required this.target});
+
+  @override
+  int get hashCode => transportType.hashCode ^ target.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is TransportInfo &&
+          runtimeType == other.runtimeType &&
+          transportType == other.transportType &&
+          target == other.target;
+}

lib/src/rust/api/token.dart

@@ -10,6 +10,21 @@ import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 // These functions are ignored because they are not marked as `pub`: `proofs`
 // These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `fmt`, `from_str`, `try_from`, `try_into`, `try_into`
 
+/// Create a token from raw proof data without network access.
+/// Uses CDK's CdkToken::new to produce a valid V4 (cashuB) token.
+/// `proofs_json` is a JSON array of proofs: [{"id":"...","amount":1,"secret":"...","C":"..."}, ...]
+Token createOfflineToken({
+  required String mintUrl,
+  required String proofsJson,
+  String? memo,
+  String? unit,
+}) => RustLib.instance.api.crateApiTokenCreateOfflineToken(
+  mintUrl: mintUrl,
+  proofsJson: proofsJson,
+  memo: memo,
+  unit: unit,
+);
+
 List<String> encodeQrToken({required Token token, BigInt? maxFragmentLength}) =>
     RustLib.instance.api.crateApiTokenEncodeQrToken(
       token: token,

lib/src/rust/api/wallet.dart

@@ -7,6 +7,7 @@ import '../frb_generated.dart';
 import 'error.dart';
 import 'mint_info.dart';
 import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+import 'payment_request.dart';
 import 'token.dart';
 
 // These functions are ignored because they are not marked as `pub`: `mint_url`, `unit`, `update_balance_streams`
@@ -49,6 +50,15 @@ abstract class Wallet implements RustOpaqueInterface {
 
   Future<void> checkPendingTransactions();
 
+  /// Create a NUT-18 payment request with Nostr transport.
+  ///
+  /// Builds a PaymentRequest with the wallet's mint URL and unit,
+  /// generates ephemeral Nostr keys, and returns both creqA and creqB
+  /// encodings plus the keys needed for the Nostr listener.
+  Future<CreatedPaymentRequest> createPaymentRequest({
+    required CreateRequestParams params,
+  });
+
   Future<void> finalizePendingMelts();
 
   Future<MintInfo?> getMint();
@@ -77,21 +87,43 @@ abstract class Wallet implements RustOpaqueInterface {
     db: db,
   );
 
+  /// Pay a NUT-18 payment request.
+  /// Uses CDK's pay_request() which handles:
+  /// - NUT-10 spending conditions
+  /// - Transport selection (Nostr preferred, HTTP POST fallback)
+  /// - Token preparation and delivery
+  Future<void> payPaymentRequest({
+    required String encoded,
+    BigInt? customAmount,
+  });
+
   Future<PreparedSend> prepareSend({required BigInt amount, SendOptions? opts});
 
   Future<BigInt> receive({required Token token, ReceiveOptions? opts});
 
+  /// Check pending-spent proofs with the mint and revert unspent ones.
+  /// Returns the number of proofs recovered.
+  Future<BigInt> reclaimPendingProofs();
+
   Future<void> recoverIncompleteSagas();
 
   Future<void> restore();
 
-  Future<Token> send({
+  Future<SendResult> send({
     required PreparedSend send,
     String? memo,
     bool? includeMemo,
   });
 
   Stream<BigInt> streamBalance();
+
+  /// Wait for an incoming Nostr payment (NIP-17 gift-wrap).
+  ///
+  /// Takes the opaque NostrListenerHandle returned by create_payment_request().
+  /// The secret key never leaves Rust memory.
+  Stream<NostrPaymentEvent> waitForNostrPayment({
+    required NostrListenerHandle handle,
+  });
 }
 
 // Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<WalletDatabase>>
@@ -150,6 +182,9 @@ class MintQuote {
   final Token? token;
   final String? error;
 
+  /// Deterministic transaction ID (set when state == Issued)
+  final String? transactionId;
+
   const MintQuote({
     required this.id,
     required this.request,
@@ -158,6 +193,7 @@ class MintQuote {
     required this.state,
     this.token,
     this.error,
+    this.transactionId,
   });
 
   @override
@@ -168,7 +204,8 @@ class MintQuote {
       expiry.hashCode ^
       state.hashCode ^
       token.hashCode ^
-      error.hashCode;
+      error.hashCode ^
+      transactionId.hashCode;
 
   @override
   bool operator ==(Object other) =>
@@ -181,7 +218,8 @@ class MintQuote {
           expiry == other.expiry &&
           state == other.state &&
           token == other.token &&
-          error == other.error;
+          error == other.error &&
+          transactionId == other.transactionId;
 }
 
 enum MintQuoteState { unpaid, paid, issued, error }
@@ -228,6 +266,29 @@ class SendOptions {
           includeFee == other.includeFee;
 }
 
+/// Result of a confirmed send, carrying both the ecash token and the
+/// deterministic transaction ID so Dart can save metadata without a racy
+/// listTransactions lookup.
+class SendResult {
+  final Token token;
+
+  /// Deterministic transaction ID (None if computation failed)
+  final String? transactionId;
+
+  const SendResult({required this.token, this.transactionId});
+
+  @override
+  int get hashCode => token.hashCode ^ transactionId.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is SendResult &&
+          runtimeType == other.runtimeType &&
+          token == other.token &&
+          transactionId == other.transactionId;
+}
+
 class Transaction {
   final String id;
   final String mintUrl;

lib/src/rust/frb_generated.io.dart

@@ -6,6 +6,7 @@
 import 'api/error.dart';
 import 'api/keys.dart';
 import 'api/mint_info.dart';
+import 'api/payment_request.dart';
 import 'api/token.dart';
 import 'api/wallet.dart';
 import 'dart:async';
@@ -22,6 +23,14 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     required super.portManager,
   });
 
+  CrossPlatformFinalizerArg
+  get rust_arc_decrement_strong_count_CreatedPaymentRequestPtr => wire
+      ._rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequestPtr;
+
+  CrossPlatformFinalizerArg
+  get rust_arc_decrement_strong_count_NostrListenerHandlePtr => wire
+      ._rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandlePtr;
+
   CrossPlatformFinalizerArg
   get rust_arc_decrement_strong_count_PreparedSendPtr => wire
       ._rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSendPtr;
@@ -41,6 +50,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   AnyhowException dco_decode_AnyhowException(dynamic raw);
 
+  @protected
+  CreatedPaymentRequest
+  dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    dynamic raw,
+  );
+
+  @protected
+  NostrListenerHandle
+  dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    dynamic raw,
+  );
+
   @protected
   PreparedSend
   dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -65,6 +86,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     dynamic raw,
   );
 
+  @protected
+  CreatedPaymentRequest
+  dco_decode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    dynamic raw,
+  );
+
   @protected
   PreparedSend
   dco_decode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -83,6 +110,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     dynamic raw,
   );
 
+  @protected
+  CreatedPaymentRequest
+  dco_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    dynamic raw,
+  );
+
+  @protected
+  NostrListenerHandle
+  dco_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    dynamic raw,
+  );
+
   @protected
   PreparedSend
   dco_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -110,6 +149,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   Map<String, String> dco_decode_Map_String_String_None(dynamic raw);
 
+  @protected
+  CreatedPaymentRequest
+  dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    dynamic raw,
+  );
+
+  @protected
+  NostrListenerHandle
+  dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    dynamic raw,
+  );
+
   @protected
   PreparedSend
   dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -137,6 +188,10 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   RustStreamSink<MintQuote> dco_decode_StreamSink_mint_quote_Sse(dynamic raw);
 
+  @protected
+  RustStreamSink<NostrPaymentEvent>
+  dco_decode_StreamSink_nostr_payment_event_Sse(dynamic raw);
+
   @protected
   RustStreamSink<BigInt> dco_decode_StreamSink_u_64_Sse(dynamic raw);
 
@@ -149,6 +204,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   bool dco_decode_box_autoadd_bool(dynamic raw);
 
+  @protected
+  CreateRequestParams dco_decode_box_autoadd_create_request_params(dynamic raw);
+
   @protected
   MeltQuote dco_decode_box_autoadd_melt_quote(dynamic raw);
 
@@ -158,6 +216,11 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   MintVersion dco_decode_box_autoadd_mint_version(dynamic raw);
 
+  @protected
+  PersistedRequestData dco_decode_box_autoadd_persisted_request_data(
+    dynamic raw,
+  );
+
   @protected
   ReceiveOptions dco_decode_box_autoadd_receive_options(dynamic raw);
 
@@ -181,6 +244,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   ContactInfo dco_decode_contact_info(dynamic raw);
 
+  @protected
+  CreateRequestParams dco_decode_create_request_params(dynamic raw);
+
   @protected
   Error dco_decode_error(dynamic raw);
 
@@ -217,6 +283,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   List<Transaction> dco_decode_list_transaction(dynamic raw);
 
+  @protected
+  List<TransportInfo> dco_decode_list_transport_info(dynamic raw);
+
   @protected
   MeltMethodSettings dco_decode_melt_method_settings(dynamic raw);
 
@@ -238,6 +307,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   MintVersion dco_decode_mint_version(dynamic raw);
 
+  @protected
+  NostrPaymentEvent dco_decode_nostr_payment_event(dynamic raw);
+
+  @protected
+  NostrPaymentState dco_decode_nostr_payment_state(dynamic raw);
+
   @protected
   Nut04Settings dco_decode_nut_04_settings(dynamic raw);
 
@@ -288,6 +363,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw);
 
+  @protected
+  PaymentRequestInfo dco_decode_payment_request_info(dynamic raw);
+
+  @protected
+  PersistedRequestData dco_decode_persisted_request_data(dynamic raw);
+
   @protected
   ReceiveOptions dco_decode_receive_options(dynamic raw);
 
@@ -297,6 +378,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   SendOptions dco_decode_send_options(dynamic raw);
 
+  @protected
+  SendResult dco_decode_send_result(dynamic raw);
+
   @protected
   SupportedSettings dco_decode_supported_settings(dynamic raw);
 
@@ -312,6 +396,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   TransactionStatus dco_decode_transaction_status(dynamic raw);
 
+  @protected
+  TransportInfo dco_decode_transport_info(dynamic raw);
+
   @protected
   BigInt dco_decode_u_64(dynamic raw);
 
@@ -327,6 +414,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   AnyhowException sse_decode_AnyhowException(SseDeserializer deserializer);
 
+  @protected
+  CreatedPaymentRequest
+  sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  NostrListenerHandle
+  sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    SseDeserializer deserializer,
+  );
+
   @protected
   PreparedSend
   sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -351,6 +450,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseDeserializer deserializer,
   );
 
+  @protected
+  CreatedPaymentRequest
+  sse_decode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    SseDeserializer deserializer,
+  );
+
   @protected
   PreparedSend
   sse_decode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -369,6 +474,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseDeserializer deserializer,
   );
 
+  @protected
+  CreatedPaymentRequest
+  sse_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  NostrListenerHandle
+  sse_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    SseDeserializer deserializer,
+  );
+
   @protected
   PreparedSend
   sse_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -398,6 +515,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseDeserializer deserializer,
   );
 
+  @protected
+  CreatedPaymentRequest
+  sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  NostrListenerHandle
+  sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    SseDeserializer deserializer,
+  );
+
   @protected
   PreparedSend
   sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -427,6 +556,10 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseDeserializer deserializer,
   );
 
+  @protected
+  RustStreamSink<NostrPaymentEvent>
+  sse_decode_StreamSink_nostr_payment_event_Sse(SseDeserializer deserializer);
+
   @protected
   RustStreamSink<BigInt> sse_decode_StreamSink_u_64_Sse(
     SseDeserializer deserializer,
@@ -441,6 +574,11 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   bool sse_decode_box_autoadd_bool(SseDeserializer deserializer);
 
+  @protected
+  CreateRequestParams sse_decode_box_autoadd_create_request_params(
+    SseDeserializer deserializer,
+  );
+
   @protected
   MeltQuote sse_decode_box_autoadd_melt_quote(SseDeserializer deserializer);
 
@@ -450,6 +588,11 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   MintVersion sse_decode_box_autoadd_mint_version(SseDeserializer deserializer);
 
+  @protected
+  PersistedRequestData sse_decode_box_autoadd_persisted_request_data(
+    SseDeserializer deserializer,
+  );
+
   @protected
   ReceiveOptions sse_decode_box_autoadd_receive_options(
     SseDeserializer deserializer,
@@ -475,6 +618,11 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   ContactInfo sse_decode_contact_info(SseDeserializer deserializer);
 
+  @protected
+  CreateRequestParams sse_decode_create_request_params(
+    SseDeserializer deserializer,
+  );
+
   @protected
   Error sse_decode_error(SseDeserializer deserializer);
 
@@ -517,6 +665,11 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   List<Transaction> sse_decode_list_transaction(SseDeserializer deserializer);
 
+  @protected
+  List<TransportInfo> sse_decode_list_transport_info(
+    SseDeserializer deserializer,
+  );
+
   @protected
   MeltMethodSettings sse_decode_melt_method_settings(
     SseDeserializer deserializer,
@@ -542,6 +695,16 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   MintVersion sse_decode_mint_version(SseDeserializer deserializer);
 
+  @protected
+  NostrPaymentEvent sse_decode_nostr_payment_event(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  NostrPaymentState sse_decode_nostr_payment_state(
+    SseDeserializer deserializer,
+  );
+
   @protected
   Nut04Settings sse_decode_nut_04_settings(SseDeserializer deserializer);
 
@@ -600,6 +763,16 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer);
 
+  @protected
+  PaymentRequestInfo sse_decode_payment_request_info(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  PersistedRequestData sse_decode_persisted_request_data(
+    SseDeserializer deserializer,
+  );
+
   @protected
   ReceiveOptions sse_decode_receive_options(SseDeserializer deserializer);
 
@@ -611,6 +784,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   SendOptions sse_decode_send_options(SseDeserializer deserializer);
 
+  @protected
+  SendResult sse_decode_send_result(SseDeserializer deserializer);
+
   @protected
   SupportedSettings sse_decode_supported_settings(SseDeserializer deserializer);
 
@@ -628,6 +804,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   TransactionStatus sse_decode_transaction_status(SseDeserializer deserializer);
 
+  @protected
+  TransportInfo sse_decode_transport_info(SseDeserializer deserializer);
+
   @protected
   BigInt sse_decode_u_64(SseDeserializer deserializer);
 
@@ -646,6 +825,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void
+  sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    CreatedPaymentRequest self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    NostrListenerHandle self,
+    SseSerializer serializer,
+  );
+
   @protected
   void
   sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -674,6 +867,13 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void
+  sse_encode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    CreatedPaymentRequest self,
+    SseSerializer serializer,
+  );
+
   @protected
   void
   sse_encode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -695,6 +895,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void
+  sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    CreatedPaymentRequest self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    NostrListenerHandle self,
+    SseSerializer serializer,
+  );
+
   @protected
   void
   sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -729,6 +943,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void
+  sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    CreatedPaymentRequest self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    NostrListenerHandle self,
+    SseSerializer serializer,
+  );
+
   @protected
   void
   sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -763,6 +991,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void sse_encode_StreamSink_nostr_payment_event_Sse(
+    RustStreamSink<NostrPaymentEvent> self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_StreamSink_u_64_Sse(
     RustStreamSink<BigInt> self,
@@ -778,6 +1012,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_box_autoadd_bool(bool self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_box_autoadd_create_request_params(
+    CreateRequestParams self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_box_autoadd_melt_quote(
     MeltQuote self,
@@ -796,6 +1036,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void sse_encode_box_autoadd_persisted_request_data(
+    PersistedRequestData self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_box_autoadd_receive_options(
     ReceiveOptions self,
@@ -826,6 +1072,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_contact_info(ContactInfo self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_create_request_params(
+    CreateRequestParams self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_error(Error self, SseSerializer serializer);
 
@@ -883,6 +1135,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void sse_encode_list_transport_info(
+    List<TransportInfo> self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_melt_method_settings(
     MeltMethodSettings self,
@@ -913,6 +1171,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_mint_version(MintVersion self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_nostr_payment_event(
+    NostrPaymentEvent self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_nostr_payment_state(
+    NostrPaymentState self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_nut_04_settings(Nut04Settings self, SseSerializer serializer);
 
@@ -982,6 +1252,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void sse_encode_payment_request_info(
+    PaymentRequestInfo self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_persisted_request_data(
+    PersistedRequestData self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_receive_options(
     ReceiveOptions self,
@@ -997,6 +1279,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_send_options(SendOptions self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_send_result(SendResult self, SseSerializer serializer);
+
   @protected
   void sse_encode_supported_settings(
     SupportedSettings self,
@@ -1021,6 +1306,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void sse_encode_transport_info(TransportInfo self, SseSerializer serializer);
+
   @protected
   void sse_encode_u_64(BigInt self, SseSerializer serializer);
 
@@ -1048,6 +1336,74 @@ class RustLibWire implements BaseWire {
   RustLibWire(ffi.DynamicLibrary dynamicLibrary)
     : _lookup = dynamicLibrary.lookup;
 
+  void
+  rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    ffi.Pointer<ffi.Void> ptr,
+  ) {
+    return _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+      ptr,
+    );
+  }
+
+  late final _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequestPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>(
+        'frbgen_elcaju_rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest',
+      );
+  late final _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest =
+      _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequestPtr
+          .asFunction<void Function(ffi.Pointer<ffi.Void>)>();
+
+  void
+  rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    ffi.Pointer<ffi.Void> ptr,
+  ) {
+    return _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+      ptr,
+    );
+  }
+
+  late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequestPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>(
+        'frbgen_elcaju_rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest',
+      );
+  late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest =
+      _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequestPtr
+          .asFunction<void Function(ffi.Pointer<ffi.Void>)>();
+
+  void
+  rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    ffi.Pointer<ffi.Void> ptr,
+  ) {
+    return _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+      ptr,
+    );
+  }
+
+  late final _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandlePtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>(
+        'frbgen_elcaju_rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle',
+      );
+  late final _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle =
+      _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandlePtr
+          .asFunction<void Function(ffi.Pointer<ffi.Void>)>();
+
+  void
+  rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    ffi.Pointer<ffi.Void> ptr,
+  ) {
+    return _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+      ptr,
+    );
+  }
+
+  late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandlePtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>(
+        'frbgen_elcaju_rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle',
+      );
+  late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle =
+      _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandlePtr
+          .asFunction<void Function(ffi.Pointer<ffi.Void>)>();
+
   void
   rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
     ffi.Pointer<ffi.Void> ptr,

lib/src/rust/frb_generated.web.dart

@@ -9,6 +9,7 @@
 import 'api/error.dart';
 import 'api/keys.dart';
 import 'api/mint_info.dart';
+import 'api/payment_request.dart';
 import 'api/token.dart';
 import 'api/wallet.dart';
 import 'dart:async';
@@ -24,6 +25,14 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     required super.portManager,
   });
 
+  CrossPlatformFinalizerArg
+  get rust_arc_decrement_strong_count_CreatedPaymentRequestPtr => wire
+      .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest;
+
+  CrossPlatformFinalizerArg
+  get rust_arc_decrement_strong_count_NostrListenerHandlePtr => wire
+      .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle;
+
   CrossPlatformFinalizerArg
   get rust_arc_decrement_strong_count_PreparedSendPtr => wire
       .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend;
@@ -43,6 +52,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   AnyhowException dco_decode_AnyhowException(dynamic raw);
 
+  @protected
+  CreatedPaymentRequest
+  dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    dynamic raw,
+  );
+
+  @protected
+  NostrListenerHandle
+  dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    dynamic raw,
+  );
+
   @protected
   PreparedSend
   dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -67,6 +88,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     dynamic raw,
   );
 
+  @protected
+  CreatedPaymentRequest
+  dco_decode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    dynamic raw,
+  );
+
   @protected
   PreparedSend
   dco_decode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -85,6 +112,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     dynamic raw,
   );
 
+  @protected
+  CreatedPaymentRequest
+  dco_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    dynamic raw,
+  );
+
+  @protected
+  NostrListenerHandle
+  dco_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    dynamic raw,
+  );
+
   @protected
   PreparedSend
   dco_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -112,6 +151,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   Map<String, String> dco_decode_Map_String_String_None(dynamic raw);
 
+  @protected
+  CreatedPaymentRequest
+  dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    dynamic raw,
+  );
+
+  @protected
+  NostrListenerHandle
+  dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    dynamic raw,
+  );
+
   @protected
   PreparedSend
   dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -139,6 +190,10 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   RustStreamSink<MintQuote> dco_decode_StreamSink_mint_quote_Sse(dynamic raw);
 
+  @protected
+  RustStreamSink<NostrPaymentEvent>
+  dco_decode_StreamSink_nostr_payment_event_Sse(dynamic raw);
+
   @protected
   RustStreamSink<BigInt> dco_decode_StreamSink_u_64_Sse(dynamic raw);
 
@@ -151,6 +206,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   bool dco_decode_box_autoadd_bool(dynamic raw);
 
+  @protected
+  CreateRequestParams dco_decode_box_autoadd_create_request_params(dynamic raw);
+
   @protected
   MeltQuote dco_decode_box_autoadd_melt_quote(dynamic raw);
 
@@ -160,6 +218,11 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   MintVersion dco_decode_box_autoadd_mint_version(dynamic raw);
 
+  @protected
+  PersistedRequestData dco_decode_box_autoadd_persisted_request_data(
+    dynamic raw,
+  );
+
   @protected
   ReceiveOptions dco_decode_box_autoadd_receive_options(dynamic raw);
 
@@ -183,6 +246,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   ContactInfo dco_decode_contact_info(dynamic raw);
 
+  @protected
+  CreateRequestParams dco_decode_create_request_params(dynamic raw);
+
   @protected
   Error dco_decode_error(dynamic raw);
 
@@ -219,6 +285,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   List<Transaction> dco_decode_list_transaction(dynamic raw);
 
+  @protected
+  List<TransportInfo> dco_decode_list_transport_info(dynamic raw);
+
   @protected
   MeltMethodSettings dco_decode_melt_method_settings(dynamic raw);
 
@@ -240,6 +309,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   MintVersion dco_decode_mint_version(dynamic raw);
 
+  @protected
+  NostrPaymentEvent dco_decode_nostr_payment_event(dynamic raw);
+
+  @protected
+  NostrPaymentState dco_decode_nostr_payment_state(dynamic raw);
+
   @protected
   Nut04Settings dco_decode_nut_04_settings(dynamic raw);
 
@@ -290,6 +365,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw);
 
+  @protected
+  PaymentRequestInfo dco_decode_payment_request_info(dynamic raw);
+
+  @protected
+  PersistedRequestData dco_decode_persisted_request_data(dynamic raw);
+
   @protected
   ReceiveOptions dco_decode_receive_options(dynamic raw);
 
@@ -299,6 +380,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   SendOptions dco_decode_send_options(dynamic raw);
 
+  @protected
+  SendResult dco_decode_send_result(dynamic raw);
+
   @protected
   SupportedSettings dco_decode_supported_settings(dynamic raw);
 
@@ -314,6 +398,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   TransactionStatus dco_decode_transaction_status(dynamic raw);
 
+  @protected
+  TransportInfo dco_decode_transport_info(dynamic raw);
+
   @protected
   BigInt dco_decode_u_64(dynamic raw);
 
@@ -329,6 +416,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   AnyhowException sse_decode_AnyhowException(SseDeserializer deserializer);
 
+  @protected
+  CreatedPaymentRequest
+  sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  NostrListenerHandle
+  sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    SseDeserializer deserializer,
+  );
+
   @protected
   PreparedSend
   sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -353,6 +452,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseDeserializer deserializer,
   );
 
+  @protected
+  CreatedPaymentRequest
+  sse_decode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    SseDeserializer deserializer,
+  );
+
   @protected
   PreparedSend
   sse_decode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -371,6 +476,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseDeserializer deserializer,
   );
 
+  @protected
+  CreatedPaymentRequest
+  sse_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  NostrListenerHandle
+  sse_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    SseDeserializer deserializer,
+  );
+
   @protected
   PreparedSend
   sse_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -400,6 +517,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseDeserializer deserializer,
   );
 
+  @protected
+  CreatedPaymentRequest
+  sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  NostrListenerHandle
+  sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    SseDeserializer deserializer,
+  );
+
   @protected
   PreparedSend
   sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -429,6 +558,10 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseDeserializer deserializer,
   );
 
+  @protected
+  RustStreamSink<NostrPaymentEvent>
+  sse_decode_StreamSink_nostr_payment_event_Sse(SseDeserializer deserializer);
+
   @protected
   RustStreamSink<BigInt> sse_decode_StreamSink_u_64_Sse(
     SseDeserializer deserializer,
@@ -443,6 +576,11 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   bool sse_decode_box_autoadd_bool(SseDeserializer deserializer);
 
+  @protected
+  CreateRequestParams sse_decode_box_autoadd_create_request_params(
+    SseDeserializer deserializer,
+  );
+
   @protected
   MeltQuote sse_decode_box_autoadd_melt_quote(SseDeserializer deserializer);
 
@@ -452,6 +590,11 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   MintVersion sse_decode_box_autoadd_mint_version(SseDeserializer deserializer);
 
+  @protected
+  PersistedRequestData sse_decode_box_autoadd_persisted_request_data(
+    SseDeserializer deserializer,
+  );
+
   @protected
   ReceiveOptions sse_decode_box_autoadd_receive_options(
     SseDeserializer deserializer,
@@ -477,6 +620,11 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   ContactInfo sse_decode_contact_info(SseDeserializer deserializer);
 
+  @protected
+  CreateRequestParams sse_decode_create_request_params(
+    SseDeserializer deserializer,
+  );
+
   @protected
   Error sse_decode_error(SseDeserializer deserializer);
 
@@ -519,6 +667,11 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   List<Transaction> sse_decode_list_transaction(SseDeserializer deserializer);
 
+  @protected
+  List<TransportInfo> sse_decode_list_transport_info(
+    SseDeserializer deserializer,
+  );
+
   @protected
   MeltMethodSettings sse_decode_melt_method_settings(
     SseDeserializer deserializer,
@@ -544,6 +697,16 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   MintVersion sse_decode_mint_version(SseDeserializer deserializer);
 
+  @protected
+  NostrPaymentEvent sse_decode_nostr_payment_event(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  NostrPaymentState sse_decode_nostr_payment_state(
+    SseDeserializer deserializer,
+  );
+
   @protected
   Nut04Settings sse_decode_nut_04_settings(SseDeserializer deserializer);
 
@@ -602,6 +765,16 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer);
 
+  @protected
+  PaymentRequestInfo sse_decode_payment_request_info(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  PersistedRequestData sse_decode_persisted_request_data(
+    SseDeserializer deserializer,
+  );
+
   @protected
   ReceiveOptions sse_decode_receive_options(SseDeserializer deserializer);
 
@@ -613,6 +786,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   SendOptions sse_decode_send_options(SseDeserializer deserializer);
 
+  @protected
+  SendResult sse_decode_send_result(SseDeserializer deserializer);
+
   @protected
   SupportedSettings sse_decode_supported_settings(SseDeserializer deserializer);
 
@@ -630,6 +806,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   TransactionStatus sse_decode_transaction_status(SseDeserializer deserializer);
 
+  @protected
+  TransportInfo sse_decode_transport_info(SseDeserializer deserializer);
+
   @protected
   BigInt sse_decode_u_64(SseDeserializer deserializer);
 
@@ -648,6 +827,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void
+  sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    CreatedPaymentRequest self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    NostrListenerHandle self,
+    SseSerializer serializer,
+  );
+
   @protected
   void
   sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -676,6 +869,13 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void
+  sse_encode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    CreatedPaymentRequest self,
+    SseSerializer serializer,
+  );
+
   @protected
   void
   sse_encode_Auto_RefMut_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -697,6 +897,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void
+  sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    CreatedPaymentRequest self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    NostrListenerHandle self,
+    SseSerializer serializer,
+  );
+
   @protected
   void
   sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -731,6 +945,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void
+  sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    CreatedPaymentRequest self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    NostrListenerHandle self,
+    SseSerializer serializer,
+  );
+
   @protected
   void
   sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
@@ -765,6 +993,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void sse_encode_StreamSink_nostr_payment_event_Sse(
+    RustStreamSink<NostrPaymentEvent> self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_StreamSink_u_64_Sse(
     RustStreamSink<BigInt> self,
@@ -780,6 +1014,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_box_autoadd_bool(bool self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_box_autoadd_create_request_params(
+    CreateRequestParams self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_box_autoadd_melt_quote(
     MeltQuote self,
@@ -798,6 +1038,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void sse_encode_box_autoadd_persisted_request_data(
+    PersistedRequestData self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_box_autoadd_receive_options(
     ReceiveOptions self,
@@ -828,6 +1074,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_contact_info(ContactInfo self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_create_request_params(
+    CreateRequestParams self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_error(Error self, SseSerializer serializer);
 
@@ -885,6 +1137,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void sse_encode_list_transport_info(
+    List<TransportInfo> self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_melt_method_settings(
     MeltMethodSettings self,
@@ -915,6 +1173,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_mint_version(MintVersion self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_nostr_payment_event(
+    NostrPaymentEvent self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_nostr_payment_state(
+    NostrPaymentState self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_nut_04_settings(Nut04Settings self, SseSerializer serializer);
 
@@ -984,6 +1254,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void sse_encode_payment_request_info(
+    PaymentRequestInfo self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_persisted_request_data(
+    PersistedRequestData self,
+    SseSerializer serializer,
+  );
+
   @protected
   void sse_encode_receive_options(
     ReceiveOptions self,
@@ -999,6 +1281,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_send_options(SendOptions self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_send_result(SendResult self, SseSerializer serializer);
+
   @protected
   void sse_encode_supported_settings(
     SupportedSettings self,
@@ -1023,6 +1308,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
     SseSerializer serializer,
   );
 
+  @protected
+  void sse_encode_transport_info(TransportInfo self, SseSerializer serializer);
+
   @protected
   void sse_encode_u_64(BigInt self, SseSerializer serializer);
 
@@ -1041,6 +1329,38 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
 class RustLibWire implements BaseWire {
   RustLibWire.fromExternalLibrary(ExternalLibrary lib);
 
+  void
+  rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    int ptr,
+  ) => wasmModule
+      .rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+        ptr,
+      );
+
+  void
+  rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    int ptr,
+  ) => wasmModule
+      .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+        ptr,
+      );
+
+  void
+  rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    int ptr,
+  ) => wasmModule
+      .rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+        ptr,
+      );
+
+  void
+  rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    int ptr,
+  ) => wasmModule
+      .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+        ptr,
+      );
+
   void
   rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
     int ptr,
@@ -1112,6 +1432,26 @@ external RustLibWasmModule get wasmModule;
 @JS()
 @anonymous
 extension type RustLibWasmModule._(JSObject _) implements JSObject {
+  external void
+  rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    int ptr,
+  );
+
+  external void
+  rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCreatedPaymentRequest(
+    int ptr,
+  );
+
+  external void
+  rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    int ptr,
+  );
+
+  external void
+  rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerNostrListenerHandle(
+    int ptr,
+  );
+
   external void
   rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerPreparedSend(
     int ptr,

linux/CMakeLists.txt

@@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
 set(BINARY_NAME "elcaju")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "com.example.elcaju")
+set(APPLICATION_ID "me.elcaju")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.

macos/Runner.xcodeproj/project.pbxproj

@@ -385,7 +385,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.elcaju.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = me.elcaju.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/elcaju.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/elcaju";
@@ -399,7 +399,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.elcaju.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = me.elcaju.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/elcaju.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/elcaju";
@@ -413,7 +413,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.elcaju.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = me.elcaju.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/elcaju.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/elcaju";

macos/Runner/Configs/AppInfo.xcconfig

@@ -8,7 +8,7 @@
 PRODUCT_NAME = elcaju
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.example.elcaju
+PRODUCT_BUNDLE_IDENTIFIER = me.elcaju
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2026 com.example. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2026 ElCaju. All rights reserved.

rust/Cargo.lock

@@ -17,6 +17,27 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -184,12 +205,49 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "async-utility"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a34a3b57207a7a1007832416c3e4862378c8451b4e8e093e436f48c2d3d2c151"
+dependencies = [
+ "futures-util",
+ "gloo-timers",
+ "tokio",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-wsocket"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c92385c7c8b3eb2de1b78aeca225212e4c9a69a78b802832759b108681a5069"
+dependencies = [
+ "async-utility",
+ "futures",
+ "futures-util",
+ "js-sys",
+ "tokio",
+ "tokio-rustls",
+ "tokio-socks",
+ "tokio-tungstenite",
+ "url",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "atomic"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
 
+[[package]]
+name = "atomic-destructor"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef49f5882e4b6afaac09ad239a4f8c70a24b8f2b0897edb1f706008efd109cf4"
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -239,6 +297,12 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64ct"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
+
 [[package]]
 name = "bc-ur"
 version = "0.12.0"
@@ -354,6 +418,15 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "brotli"
 version = "8.0.2"
@@ -425,6 +498,7 @@ dependencies = [
  "ciborium",
  "lightning",
  "lightning-invoice",
+ "nostr-sdk",
  "once_cell",
  "serde",
  "serde_json",
@@ -439,6 +513,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "cbor-diag"
 version = "0.1.12"
@@ -490,6 +573,7 @@ dependencies = [
  "jsonwebtoken",
  "lightning",
  "lightning-invoice",
+ "nostr-sdk",
  "regex",
  "ring",
  "rustls",
@@ -628,6 +712,30 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chacha20"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "chacha20poly1305"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.44"
@@ -669,6 +777,17 @@ dependencies = [
  "half",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+ "zeroize",
+]
+
 [[package]]
 name = "clap"
 version = "4.6.0"
@@ -807,6 +926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
@@ -915,6 +1035,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
+ "subtle",
 ]
 
 [[package]]
@@ -940,6 +1061,12 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
 [[package]]
 name = "elcaju_core"
 version = "0.1.0"
@@ -953,6 +1080,7 @@ dependencies = [
  "flutter_rust_bridge",
  "getrandom 0.3.4",
  "log",
+ "nostr-sdk",
  "oslog",
  "reqwest",
  "serde_json",
@@ -1313,6 +1441,15 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "home"
 version = "0.5.12"
@@ -1397,7 +1534,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tower-service",
- "webpki-roots",
+ "webpki-roots 1.0.6",
 ]
 
 [[package]]
@@ -1584,6 +1721,28 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.12.0"
@@ -1754,6 +1913,12 @@ version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
+[[package]]
+name = "lru"
+version = "0.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593"
+
 [[package]]
 name = "lru-slab"
 version = "0.1.2"
@@ -1832,6 +1997,12 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "negentropy"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0efe882e02d206d8d279c20eb40e03baf7cb5136a1476dc084a324fbc3ec42d"
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -1842,6 +2013,84 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nostr"
+version = "0.44.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3aa5e3b6a278ed061835fe1ee293b71641e6bf8b401cfe4e1834bbf4ef0a34e1"
+dependencies = [
+ "aes",
+ "base64 0.22.1",
+ "bech32",
+ "bip39",
+ "bitcoin_hashes 0.14.1",
+ "cbc",
+ "chacha20",
+ "chacha20poly1305",
+ "getrandom 0.2.17",
+ "hex",
+ "instant",
+ "scrypt",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "unicode-normalization",
+ "url",
+]
+
+[[package]]
+name = "nostr-database"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7462c9d8ae5ef6a28d66a192d399ad2530f1f2130b13186296dbb11bdef5b3d1"
+dependencies = [
+ "lru",
+ "nostr",
+ "tokio",
+]
+
+[[package]]
+name = "nostr-gossip"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade30de16869618919c6b5efc8258f47b654a98b51541eb77f85e8ec5e3c83a6"
+dependencies = [
+ "nostr",
+]
+
+[[package]]
+name = "nostr-relay-pool"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b1073ccfbaea5549fb914a9d52c68dab2aecda61535e5143dd73e95445a804b"
+dependencies = [
+ "async-utility",
+ "async-wsocket",
+ "atomic-destructor",
+ "hex",
+ "lru",
+ "negentropy",
+ "nostr",
+ "nostr-database",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "nostr-sdk"
+version = "0.44.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "471732576710e779b64f04c55e3f8b5292f865fea228436daf19694f0bf70393"
+dependencies = [
+ "async-utility",
+ "nostr",
+ "nostr-database",
+ "nostr-gossip",
+ "nostr-relay-pool",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.3"
@@ -1927,6 +2176,12 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
 [[package]]
 name = "openssl-probe"
 version = "0.2.1"
@@ -1967,12 +2222,33 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "password-hash"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest",
+ "hmac",
+]
+
 [[package]]
 name = "pem"
 version = "3.0.6"
@@ -2069,6 +2345,17 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
+[[package]]
+name = "poly1305"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
+dependencies = [
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.13.1"
@@ -2365,7 +2652,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots",
+ "webpki-roots 1.0.6",
 ]
 
 [[package]]
@@ -2467,6 +2754,15 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
+[[package]]
+name = "salsa20"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.29"
@@ -2506,6 +2802,18 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "scrypt"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
+dependencies = [
+ "password-hash",
+ "pbkdf2",
+ "salsa20",
+ "sha2",
+]
+
 [[package]]
 name = "secp256k1"
 version = "0.29.1"
@@ -2659,6 +2967,17 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -2960,6 +3279,18 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-socks"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
+dependencies = [
+ "either",
+ "futures-util",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.18"
@@ -2985,6 +3316,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tungstenite",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
@@ -3184,6 +3516,16 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -3213,6 +3555,7 @@ dependencies = [
  "idna",
  "percent-encoding",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -3405,6 +3748,15 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.6",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "1.0.6"

rust/Cargo.toml

@@ -8,8 +8,8 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 # Cashu — acceso directo, sin intermediarios
-cdk = { version = "0.15.1", default-features = false, features = ["wallet"] }
-cdk-common = { version = "0.15.1", default-features = false }
+cdk = { version = "0.15.1", default-features = false, features = ["wallet", "nostr"] }
+cdk-common = { version = "0.15.1", default-features = false, features = ["nostr"] }
 cdk-sqlite = { version = "0.15.1", default-features = false, features = ["wallet"] }
 
 # Bridge Flutter <-> Rust
@@ -31,6 +31,9 @@ bip39 = { version = "2.1", default-features = false, features = ["std"] }
 # Entropy
 getrandom = { version = "0.3", default-features = false, features = ["std"] }
 
+# Nostr keys (same version as CDK 0.15.1 — CDK does not re-export Keys)
+nostr-sdk = { version = "0.44.1", default-features = false, features = ["nip04", "nip44", "nip59"] }
+
 # Async runtime
 tokio = { version = "1", default-features = false }
 

rust/src/api/mod.rs

@@ -1,5 +1,6 @@
 pub mod error;
 pub mod keys;
 pub mod mint_info;
+pub mod payment_request;
 pub mod token;
 pub mod wallet;

rust/src/api/payment_request.rs

@@ -0,0 +1,590 @@
+use std::str::FromStr;
+
+use cdk::{
+    amount::Amount,
+    mint_url::MintUrl,
+    nuts::{
+        CurrencyUnit, PaymentRequest as CdkPaymentRequest, Transport, TransportType,
+    },
+    wallet::ReceiveOptions as CdkReceiveOptions,
+};
+use flutter_rust_bridge::frb;
+use nostr_sdk::{
+    nips::nip19::{Nip19Profile, ToBech32},
+    Keys as NostrKeys, PublicKey, RelayUrl,
+};
+
+use crate::frb_generated::StreamSink;
+
+use super::{error::Error, wallet::Wallet};
+
+// ========================================================================
+// Payment Request parsing (NUT-18 creqA + NUT-26 creqB)
+// ========================================================================
+
+/// Parsed payment request info exposed to Flutter.
+/// CDK's FromStr auto-detects creqA (CBOR) vs creqB (Bech32m).
+pub struct PaymentRequestInfo {
+    /// Raw encoded string (creqA... or CREQB1...)
+    pub raw: String,
+    /// Payment id
+    pub payment_id: Option<String>,
+    /// Requested amount (in base unit)
+    pub amount: Option<u64>,
+    /// Currency unit ("sat", "usd", etc.)
+    pub unit: Option<String>,
+    /// Whether this is a single-use request
+    pub single_use: Option<bool>,
+    /// Accepted mints (empty = any mint)
+    pub mints: Vec<String>,
+    /// Human-readable description
+    pub description: Option<String>,
+    /// Available transports
+    pub transports: Vec<TransportInfo>,
+    /// Whether NUT-10 spending conditions are required
+    pub has_nut10: bool,
+}
+
+/// Transport info exposed to Flutter
+pub struct TransportInfo {
+    /// "nostr" or "post"
+    pub transport_type: String,
+    /// Target (nprofile or URL)
+    pub target: String,
+}
+
+impl PaymentRequestInfo {
+    /// Parse a payment request string (creqA, CREQB1, or bitcoin:?creq=).
+    /// Supports NUT-18 (CBOR+base64) and NUT-26 (Bech32m) automatically.
+    #[frb(sync)]
+    pub fn parse(encoded: String) -> Result<PaymentRequestInfo, Error> {
+        parse_payment_request_inner(encoded)
+    }
+}
+
+/// Inner parsing logic, outside of frb macro scope to avoid iterator issues.
+fn parse_payment_request_inner(encoded: String) -> Result<PaymentRequestInfo, Error> {
+    let creq_str = extract_creq_from_uri(&encoded).unwrap_or(encoded);
+
+    let pr = CdkPaymentRequest::from_str(&creq_str)
+        .map_err(|e| Error::Cdk(format!("Invalid payment request: {e}")))?;
+
+    let mints: Vec<String> = match &pr.mints {
+        Some(list) => {
+            let mut v = Vec::new();
+            for m in list {
+                v.push(format!("{}", m));
+            }
+            v
+        }
+        None => Vec::new(),
+    };
+    let mut transports = Vec::new();
+    for t in &pr.transports {
+        transports.push(TransportInfo {
+            transport_type: match t._type {
+                TransportType::Nostr => "nostr".into(),
+                TransportType::HttpPost => "post".into(),
+            },
+            target: t.target.clone(),
+        });
+    }
+    let has_nut10 = pr.nut10.is_some();
+
+    Ok(PaymentRequestInfo {
+        raw: creq_str,
+        payment_id: pr.payment_id,
+        amount: pr.amount.map(|a| a.into()),
+        unit: pr.unit.map(|u| format!("{}", u)),
+        single_use: pr.single_use,
+        mints,
+        description: pr.description,
+        transports,
+        has_nut10,
+    })
+}
+
+/// Extract creq parameter from a BIP-321 bitcoin: URI.
+/// e.g. "bitcoin:?creq=CREQB1...&lightning=lnbc..." → "CREQB1..."
+/// Handles percent-encoding and case-insensitive key matching.
+fn extract_creq_from_uri(input: &str) -> Option<String> {
+    if !input
+        .get(..8)
+        .is_some_and(|scheme| scheme.eq_ignore_ascii_case("bitcoin:"))
+    {
+        return None;
+    }
+    let query = input.split_once('?')?.1;
+    for param in query.split('&') {
+        let (key, value) = param.split_once('=')?;
+        if key.eq_ignore_ascii_case("creq") {
+            return Some(percent_decode(value));
+        }
+    }
+    None
+}
+
+/// Simple percent-decoding for URI query values.
+fn percent_decode(value: &str) -> String {
+    let bytes = value.as_bytes();
+    let mut out = Vec::with_capacity(bytes.len());
+    let mut i = 0;
+    while i < bytes.len() {
+        if bytes[i] == b'%' && i + 2 < bytes.len() {
+            if let Ok(byte) = u8::from_str_radix(
+                std::str::from_utf8(&bytes[i + 1..i + 3]).unwrap_or(""),
+                16,
+            ) {
+                out.push(byte);
+                i += 3;
+                continue;
+            }
+        }
+        out.push(bytes[i]);
+        i += 1;
+    }
+    String::from_utf8(out).unwrap_or_else(|_| value.to_string())
+}
+
+// ========================================================================
+// Payment execution (payer side)
+// ========================================================================
+
+impl Wallet {
+    /// Pay a NUT-18 payment request.
+    /// Uses CDK's pay_request() which handles:
+    /// - NUT-10 spending conditions
+    /// - Transport selection (Nostr preferred, HTTP POST fallback)
+    /// - Token preparation and delivery
+    pub async fn pay_payment_request(
+        &self,
+        encoded: String,
+        custom_amount: Option<u64>,
+    ) -> Result<(), Error> {
+        let creq_str = extract_creq_from_uri(&encoded).unwrap_or(encoded);
+
+        let pr = CdkPaymentRequest::from_str(&creq_str)
+            .map_err(|e| Error::Cdk(format!("Invalid payment request: {e}")))?;
+
+        self.inner
+            .pay_request(pr, custom_amount.map(Amount::from))
+            .await?;
+
+        self.update_balance_streams().await;
+        Ok(())
+    }
+}
+
+// ========================================================================
+// Payment Request creation (payee/receiver side) — NUT-18/26
+// ========================================================================
+
+/// Parameters for creating a payment request.
+pub struct CreateRequestParams {
+    /// Amount to request (in smallest unit, e.g. sats)
+    pub amount: Option<u64>,
+    /// Currency unit ("sat", "usd", etc.)
+    pub unit: String,
+    /// Human-readable description
+    pub description: Option<String>,
+    /// Nostr relay URLs for the transport
+    pub nostr_relays: Vec<String>,
+}
+
+/// Result of creating a payment request.
+pub struct CreatedPaymentRequest {
+    /// NUT-18 encoding: creqA... (CBOR+base64url)
+    pub creq_a: String,
+    /// NUT-26 encoding: CREQB1... (Bech32m, uppercase for QR)
+    pub creq_b: String,
+    /// Opaque handle holding the ephemeral Nostr keys — pass to wait_for_nostr_payment().
+    /// The secret key never leaves Rust.
+    pub listener_handle: NostrListenerHandle,
+}
+
+/// Opaque handle that keeps Nostr ephemeral keys in Rust memory.
+/// Dart receives this as an opaque reference and passes it back
+/// to wait_for_nostr_payment() without ever seeing the secret key.
+/// Also carries the expected payment parameters for validation.
+#[derive(Clone)]
+pub struct NostrListenerHandle {
+    keys: NostrKeys,
+    pubkey: PublicKey,
+    relays: Vec<String>,
+    /// Expected amount (None = any amount accepted)
+    expected_amount: Option<Amount>,
+    /// Expected currency unit
+    expected_unit: CurrencyUnit,
+    /// This wallet's mint URL
+    mint_url: MintUrl,
+}
+
+/// Serializable data for persisting a NostrListenerHandle across app restarts.
+pub struct PersistedRequestData {
+    pub secret_hex: String,
+    pub pubkey_hex: String,
+    pub relays: Vec<String>,
+    pub amount: Option<u64>,
+    pub unit: String,
+    pub mint_url: String,
+}
+
+impl NostrListenerHandle {
+    /// Export handle data for persistence (e.g. SharedPreferences).
+    /// The secret key is exposed as hex — the caller is responsible
+    /// for storing it securely.
+    #[frb(sync)]
+    pub fn to_persisted(&self) -> PersistedRequestData {
+        PersistedRequestData {
+            secret_hex: self.keys.secret_key().to_secret_hex(),
+            pubkey_hex: self.pubkey.to_hex(),
+            relays: self.relays.clone(),
+            amount: self.expected_amount.map(|a| a.into()),
+            unit: self.expected_unit.to_string(),
+            mint_url: self.mint_url.to_string(),
+        }
+    }
+
+    /// Reconstruct a handle from persisted data (e.g. after app restart).
+    #[frb(sync)]
+    pub fn from_persisted(data: PersistedRequestData) -> Result<NostrListenerHandle, Error> {
+        let secret_key = nostr_sdk::SecretKey::from_hex(&data.secret_hex)
+            .map_err(|e| Error::Cdk(format!("Invalid persisted secret key: {e}")))?;
+        let keys = NostrKeys::new(secret_key);
+        // Derive pubkey from secret — don't trust the persisted copy
+        let pubkey = keys.public_key;
+        let unit = CurrencyUnit::from_str(&data.unit)
+            .unwrap_or(CurrencyUnit::Custom(data.unit));
+        let mint_url = MintUrl::from_str(&data.mint_url)
+            .map_err(|e| Error::Cdk(format!("Invalid persisted mint URL: {e}")))?;
+
+        Ok(NostrListenerHandle {
+            keys,
+            pubkey,
+            relays: data.relays,
+            expected_amount: data.amount.map(Amount::from),
+            expected_unit: unit,
+            mint_url,
+        })
+    }
+}
+
+/// State of a Nostr payment listener.
+pub enum NostrPaymentState {
+    /// Connected to relays, waiting for payment
+    Waiting,
+    /// Payment received and tokens claimed
+    Received,
+    /// Error occurred
+    Error,
+}
+
+/// Event emitted by the Nostr payment listener.
+pub struct NostrPaymentEvent {
+    pub state: NostrPaymentState,
+    pub amount: Option<u64>,
+    pub error: Option<String>,
+}
+
+impl Wallet {
+    /// Create a NUT-18 payment request with Nostr transport.
+    ///
+    /// Builds a PaymentRequest with the wallet's mint URL and unit,
+    /// generates ephemeral Nostr keys, and returns both creqA and creqB
+    /// encodings plus the keys needed for the Nostr listener.
+    pub async fn create_payment_request(
+        &self,
+        params: CreateRequestParams,
+    ) -> Result<CreatedPaymentRequest, Error> {
+        // Generate ephemeral Nostr keys for this request
+        let keys = NostrKeys::generate();
+
+        // Parse relay URLs for nprofile
+        if params.nostr_relays.is_empty() {
+            return Err(Error::InvalidInput);
+        }
+
+        let relay_urls: Vec<RelayUrl> = params
+            .nostr_relays
+            .iter()
+            .map(|r| RelayUrl::parse(r))
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(|e| Error::Cdk(format!("Invalid relay URL: {e}")))?;
+
+        let nprofile = Nip19Profile::new(keys.public_key, relay_urls);
+        let nprofile_bech32 = nprofile
+            .to_bech32()
+            .map_err(|e| Error::Cdk(format!("nprofile encoding failed: {e}")))?;
+
+        // Build the Nostr transport
+        let nostr_transport = Transport {
+            _type: TransportType::Nostr,
+            target: nprofile_bech32,
+            tags: Some(vec![vec!["n".to_string(), "17".to_string()]]),
+        };
+
+        // Build the PaymentRequest with this wallet's mint and unit
+        let mint_url = self.mint_url()?;
+        if params.unit != self.unit {
+            return Err(Error::InvalidInput);
+        }
+        let unit = CurrencyUnit::from_str(&self.unit)
+            .unwrap_or(CurrencyUnit::Custom(self.unit.clone()));
+
+        let pr = CdkPaymentRequest {
+            payment_id: None,
+            amount: params.amount.map(Amount::from),
+            unit: Some(unit.clone()),
+            single_use: Some(true),
+            mints: Some(vec![mint_url.clone()]),
+            description: params.description,
+            transports: vec![nostr_transport],
+            nut10: None,
+        };
+
+        // Encode both formats
+        let creq_a = pr.to_string(); // NUT-18: creqA...
+        let creq_b = pr
+            .to_bech32_string()
+            .map_err(|e| Error::Cdk(format!("Bech32m encoding failed: {e}")))?;
+
+        let pubkey = keys.public_key;
+        Ok(CreatedPaymentRequest {
+            creq_a,
+            creq_b,
+            listener_handle: NostrListenerHandle {
+                keys,
+                pubkey,
+                relays: params.nostr_relays,
+                expected_amount: params.amount.map(Amount::from),
+                expected_unit: unit,
+                mint_url,
+            },
+        })
+    }
+
+    /// Wait for an incoming Nostr payment (NIP-17 gift-wrap).
+    ///
+    /// Takes the opaque NostrListenerHandle returned by create_payment_request().
+    /// The secret key never leaves Rust memory.
+    pub async fn wait_for_nostr_payment(
+        &self,
+        handle: NostrListenerHandle,
+        sink: StreamSink<NostrPaymentEvent>,
+    ) -> Result<(), Error> {
+        let NostrListenerHandle {
+            keys,
+            pubkey,
+            relays,
+            expected_amount,
+            expected_unit,
+            mint_url,
+        } = handle;
+
+        // Fail fast if the handle was created for a different wallet
+        let current_mint = self.mint_url()?;
+        let current_unit = CurrencyUnit::from_str(&self.unit)
+            .unwrap_or(CurrencyUnit::Custom(self.unit.clone()));
+        if mint_url != current_mint || expected_unit != current_unit {
+            return Err(Error::InvalidInput);
+        }
+
+        if sink
+            .add(NostrPaymentEvent {
+                state: NostrPaymentState::Waiting,
+                amount: None,
+                error: None,
+            })
+            .is_err()
+        {
+            return Ok(());
+        }
+
+        let _self = self.clone();
+        flutter_rust_bridge::spawn(async move {
+            match wait_for_nostr_payment_inner(
+                &_self, keys, pubkey, relays, expected_amount, expected_unit, mint_url, &sink,
+            )
+            .await
+            {
+                Ok(amount) => {
+                    let _ = sink.add(NostrPaymentEvent {
+                        state: NostrPaymentState::Received,
+                        amount: Some(amount.into()),
+                        error: None,
+                    });
+                    _self.update_balance_streams().await;
+                }
+                Err(e) => {
+                    let _ = sink.add(NostrPaymentEvent {
+                        state: NostrPaymentState::Error,
+                        amount: None,
+                        error: Some(e.to_string()),
+                    });
+                }
+            }
+        });
+
+        Ok(())
+    }
+}
+
+/// Internal: connect to relays, listen for gift-wrapped payment, receive tokens.
+/// Validates incoming payments against expected amount/unit/mint before accepting.
+/// Periodically checks if the Dart stream is still alive and disconnects if not.
+#[allow(clippy::too_many_arguments)]
+async fn wait_for_nostr_payment_inner(
+    wallet: &Wallet,
+    keys: NostrKeys,
+    pubkey: PublicKey,
+    relays: Vec<String>,
+    expected_amount: Option<Amount>,
+    expected_unit: CurrencyUnit,
+    expected_mint: MintUrl,
+    sink: &StreamSink<NostrPaymentEvent>,
+) -> Result<Amount, Error> {
+    use cdk::nuts::{nut00::ProofsMethods, PaymentRequestPayload, Token as CdkToken};
+    use nostr_sdk::{Client, Filter, Kind};
+    use std::time::Duration;
+
+    // Create Nostr client with ephemeral keys
+    let client = Client::new(keys.clone());
+    for relay in &relays {
+        client
+            .add_read_relay(relay)
+            .await
+            .map_err(|e| Error::Cdk(format!("Failed to add relay {relay}: {e}")))?;
+    }
+
+    // Connect with timeout so we fail fast if relays are unreachable
+    tokio::time::timeout(Duration::from_secs(10), client.connect())
+        .await
+        .map_err(|_| Error::Network("Relay connection timed out".to_string()))?;
+
+    // Create the broadcast receiver BEFORE subscribing so we capture historical
+    // events the relay sends back in response to our subscription filter.
+    // (broadcast::Receiver only sees messages sent after its creation)
+    let mut notifications = client.notifications();
+
+    // Subscribe to NIP-17 gift-wrap events (kind 1059) addressed to our ephemeral pubkey
+    let filter = Filter::new().pubkey(pubkey).kind(Kind::GiftWrap);
+    client
+        .subscribe(filter, None)
+        .await
+        .map_err(|e| Error::Cdk(format!("Subscription failed: {e}")))?;
+    loop {
+        match tokio::time::timeout(Duration::from_secs(1), notifications.recv()).await {
+            Ok(Ok(notification)) => {
+                // Check sink is alive before processing
+                if sink
+                    .add(NostrPaymentEvent {
+                        state: NostrPaymentState::Waiting,
+                        amount: None,
+                        error: None,
+                    })
+                    .is_err()
+                {
+                    client.disconnect().await;
+                    return Err(Error::Network("Listener cancelled by client".to_string()));
+                }
+
+                if let nostr_sdk::RelayPoolNotification::Event { event, .. } = notification {
+                    // Try to unwrap NIP-17 gift-wrap
+                    let unwrapped = match client.unwrap_gift_wrap(&event).await {
+                        Ok(rumor) => rumor,
+                        Err(_) => continue,
+                    };
+
+                    // Parse PaymentRequestPayload from the rumor content
+                    let payload: PaymentRequestPayload =
+                        match serde_json::from_str(&unwrapped.rumor.content) {
+                            Ok(p) => p,
+                            Err(_) => continue,
+                        };
+
+                    // Validate unit matches
+                    if payload.unit != expected_unit {
+                        log::warn!(
+                            "Ignoring payment: unit mismatch (expected {}, got {})",
+                            expected_unit,
+                            payload.unit
+                        );
+                        continue;
+                    }
+
+                    // Validate mint matches
+                    if payload.mint != expected_mint {
+                        log::warn!(
+                            "Ignoring payment: mint mismatch (expected {}, got {})",
+                            expected_mint,
+                            payload.mint
+                        );
+                        continue;
+                    }
+
+                    // Validate amount if a specific amount was requested
+                    if let Some(expected) = expected_amount {
+                        let received_amount = payload.proofs.total_amount().unwrap_or_default();
+                        if received_amount < expected {
+                            log::warn!(
+                                "Ignoring payment: underpayment (expected {}, got {})",
+                                expected,
+                                received_amount
+                            );
+                            continue;
+                        }
+                    }
+
+                    // Build a token from the validated payload and receive it
+                    let token = CdkToken::new(
+                        payload.mint,
+                        payload.proofs,
+                        payload.memo,
+                        payload.unit,
+                    );
+                    let token_str = token.to_string();
+
+                    // Continue listening on receive errors (e.g. already-spent proofs)
+                    match wallet
+                        .inner
+                        .receive(&token_str, CdkReceiveOptions::default())
+                        .await
+                    {
+                        Ok(received) => {
+                            client.disconnect().await;
+                            return Ok(received);
+                        }
+                        Err(e) => {
+                            log::warn!("Failed to receive token, continuing: {e}");
+                            continue;
+                        }
+                    }
+                }
+            }
+            Ok(Err(_)) => {
+                // Notification channel closed
+                break;
+            }
+            Err(_) => {
+                // Timeout — check if the Dart stream is still alive
+                if sink
+                    .add(NostrPaymentEvent {
+                        state: NostrPaymentState::Waiting,
+                        amount: None,
+                        error: None,
+                    })
+                    .is_err()
+                {
+                    // Dart side cancelled the stream, clean up
+                    client.disconnect().await;
+                    return Err(Error::Network("Listener cancelled by client".to_string()));
+                }
+            }
+        }
+    }
+
+    client.disconnect().await;
+    Err(Error::Network(
+        "Nostr listener ended before a payment was received".to_string(),
+    ))
+}

rust/src/api/token.rs

@@ -4,7 +4,10 @@ use std::{
 };
 
 use bc_ur::{prelude::CBOR, MultipartDecoder, MultipartEncoder, UR};
-use cdk::nuts::Token as CdkToken;
+use cdk::{
+    mint_url::MintUrl,
+    nuts::{CurrencyUnit, Proof, Token as CdkToken},
+};
 use cdk_common::{KeySetInfo, Proofs};
 use flutter_rust_bridge::frb;
 
@@ -92,6 +95,27 @@ impl TryInto<CdkToken> for &Token {
     }
 }
 
+// === Offline token creation ===
+
+/// Create a token from raw proof data without network access.
+/// Uses CDK's CdkToken::new to produce a valid V4 (cashuB) token.
+/// `proofs_json` is a JSON array of proofs: [{"id":"...","amount":1,"secret":"...","C":"..."}, ...]
+#[frb(sync)]
+pub fn create_offline_token(
+    mint_url: &str,
+    proofs_json: &str,
+    memo: Option<String>,
+    unit: Option<String>,
+) -> Result<Token, Error> {
+    let mint_url = MintUrl::from_str(mint_url)?;
+    let unit = unit
+        .map(|u| CurrencyUnit::from_str(&u).unwrap_or(CurrencyUnit::Custom(u)))
+        .unwrap_or(CurrencyUnit::Sat);
+    let proofs: Vec<Proof> = serde_json::from_str(proofs_json)?;
+    let token = CdkToken::new(mint_url, proofs, memo, unit);
+    Token::try_from(token)
+}
+
 // === QR Multiframe (bc-ur) ===
 
 pub struct TokenDecoder {

rust/src/api/wallet.rs

@@ -12,19 +12,21 @@ use cdk::{
     wallet::{
         MeltQuote as CdkMeltQuote, MintQuote as CdkMintQuote, PreparedSend as CdkPreparedSend,
         ReceiveOptions as CdkReceiveOptions, SendMemo, SendOptions as CdkSendOptions,
-        Wallet as CdkWallet,
+        Wallet as CdkWallet, WalletSubscription,
     },
 };
 use cdk_common::{
     util::unix_time,
     wallet::{
         Transaction as CdkTransaction, TransactionDirection as CdkTransactionDirection,
+        TransactionId,
     },
+    NotificationPayload,
 };
 use cdk_sqlite::WalletSqliteDatabase;
 use flutter_rust_bridge::frb;
 use log::info;
-use tokio::{sync::broadcast, time::sleep};
+use tokio::sync::broadcast;
 use uuid::Uuid;
 
 use crate::frb_generated::StreamSink;
@@ -45,7 +47,7 @@ pub struct Wallet {
     pub unit: String,
 
     balance_broadcast: broadcast::Sender<u64>,
-    inner: CdkWallet,
+    pub(crate) inner: CdkWallet,
     seed: [u8; 64],
 }
 
@@ -131,12 +133,12 @@ impl Wallet {
         send: PreparedSend,
         memo: Option<String>,
         include_memo: Option<bool>,
-    ) -> Result<Token, Error> {
+    ) -> Result<SendResult, Error> {
         let send_memo = memo.map(|m| SendMemo {
             memo: m,
             include_memo: include_memo.unwrap_or_default(),
         });
-        let token = self
+        let cdk_token = self
             .inner
             .confirm_send(
                 send.operation_id,
@@ -148,10 +150,35 @@ impl Wallet {
                 send.cdk_send_fee,
                 send_memo,
             )
-            .await?
-            .to_string();
+            .await?;
+
+        // Compute the deterministic transaction ID from the token's proofs
+        // (SHA-256 of sorted Y values — same as CDK uses internally)
+        // Best-effort: send is already committed, don't fail on ID computation
+        let tx_id = match self.inner.get_mint_keysets().await {
+            Ok(keysets) => match cdk_token.proofs(&keysets) {
+                Ok(proofs) => TransactionId::try_from(proofs)
+                    .map(|id| id.to_string())
+                    .map_err(|e| info!("Failed to compute tx ID from proofs: {e}"))
+                    .ok(),
+                Err(e) => {
+                    info!("Failed to extract proofs from token: {e}");
+                    None
+                }
+            },
+            Err(e) => {
+                info!("Failed to fetch keysets for tx ID: {e}");
+                None
+            }
+        };
+
+        let token_str = cdk_token.to_string();
         self.update_balance_streams().await;
-        Ok(Token::from_str(&token)?)
+
+        Ok(SendResult {
+            token: Token::from_str(&token_str)?,
+            transaction_id: tx_id,
+        })
     }
 
     pub async fn cancel_send(&self, send: PreparedSend) -> Result<(), Error> {
@@ -179,97 +206,198 @@ impl Wallet {
             .inner
             .mint_quote(PaymentMethod::BOLT11, Some(amount.into()), description, None)
             .await?;
-        let _ = sink.add(MintQuote::from(quote.clone()));
+
+        if sink.add(MintQuote::from(quote.clone())).is_err() {
+            return Ok(());
+        }
+
+        // Try WebSocket (NUT-17) subscription — if unavailable, HTTP polling still works
+        let subscription = match self
+            .inner
+            .subscribe(WalletSubscription::Bolt11MintQuoteState(vec![quote.id.clone()]))
+            .await
+        {
+            Ok(sub) => Some(sub),
+            Err(e) => {
+                info!(
+                    "Mint quote {}: WebSocket unavailable, using HTTP polling only: {e}",
+                    quote.id
+                );
+                None
+            }
+        };
 
         let _self = self.clone();
         flutter_rust_bridge::spawn(async move {
-            loop {
-                sleep(Duration::from_secs(3)).await;
-                info!("Checking mint quote state for {}", quote.id);
-                match _self.inner.check_mint_quote_status(&quote.id).await {
-                    Ok(state_res) => match state_res.state {
-                        CdkMintQuoteState::Unpaid => {
-                            if state_res.expiry < unix_time() {
-                                let _ = sink.add(MintQuote {
-                                    id: quote.id,
-                                    request: quote.request,
-                                    amount: quote.amount.map(|a| a.into()),
-                                    expiry: Some(state_res.expiry),
-                                    state: MintQuoteState::Error,
-                                    token: None,
-                                    error: Some("Quote expired".to_string()),
-                                });
-                                break;
+            // Timeout: time until quote expires + 30s buffer, or 1 hour if no expiry
+            let remaining = quote.expiry.saturating_sub(unix_time());
+            let timeout_dur = if quote.expiry == 0 {
+                Duration::from_secs(3600)
+            } else {
+                Duration::from_secs(remaining + 30)
+            };
+
+            // Clone for the timeout error path (originals are moved into the async block)
+            let expired_id = quote.id.clone();
+            let expired_request = quote.request.clone();
+            let expired_amount = quote.amount;
+            let expired_expiry = quote.expiry;
+
+            // Detect payment via two parallel paths:
+            // - Path A: WebSocket (NUT-17) — fast when it works (sats on most mints)
+            // - Path B: HTTP polling every 5s — fallback for mints that don't send
+            //   WebSocket notifications for all units (e.g. Nutshell 0.20.0 + USD)
+            // First one to detect payment wins.
+            let quote_id_for_poll = quote.id.clone();
+            let poll_wallet = _self.clone();
+
+            // Timeout only covers detection, not minting.
+            // If payment is detected near expiry, mint() must still complete.
+            enum Detected {
+                Paid,
+                Issued,
+            }
+
+            let mut subscription = subscription;
+            let detected = tokio::time::timeout(timeout_dur, async {
+                tokio::select! {
+                    // Path A: WebSocket subscription (skipped if unavailable)
+                    result = async {
+                        let Some(ref mut sub) = subscription else {
+                            return std::future::pending::<Detected>().await;
+                        };
+                        while let Some(event) = sub.recv().await {
+                            match event.into_inner() {
+                                NotificationPayload::MintQuoteBolt11Response(info)
+                                    if info.state == CdkMintQuoteState::Paid =>
+                                {
+                                    info!("Mint quote {} paid via WebSocket", quote.id);
+                                    return Detected::Paid;
+                                }
+                                NotificationPayload::MintQuoteBolt11Response(info)
+                                    if info.state == CdkMintQuoteState::Issued =>
+                                {
+                                    return Detected::Issued;
+                                }
+                                _ => continue,
                             }
-                            continue;
                         }
-                        CdkMintQuoteState::Issued => {
-                            break;
+                        std::future::pending::<Detected>().await
+                    } => result,
+
+                    // Path B: HTTP polling fallback
+                    result = async {
+                        loop {
+                            tokio::time::sleep(Duration::from_secs(5)).await;
+                            match poll_wallet.inner.check_mint_quote_status(&quote_id_for_poll).await {
+                                Ok(q) if q.state == CdkMintQuoteState::Paid => {
+                                    info!("Mint quote {} paid via HTTP polling", quote_id_for_poll);
+                                    return Detected::Paid;
+                                }
+                                Ok(q) if q.state == CdkMintQuoteState::Issued => {
+                                    return Detected::Issued;
+                                }
+                                _ => continue,
+                            }
                         }
-                        CdkMintQuoteState::Paid => {
+                    } => result,
+                }
+            })
+            .await;
+
+            // Handle detection result — mint logic runs outside the timeout
+            match detected {
+                Err(_) => {
+                    // Timeout: quote expired
+                    let _ = sink.add(MintQuote {
+                        id: expired_id,
+                        request: expired_request,
+                        amount: expired_amount.map(|a| a.into()),
+                        expiry: Some(expired_expiry),
+                        state: MintQuoteState::Error,
+                        token: None,
+                        error: Some("Quote expired".to_string()),
+                        transaction_id: None,
+                    });
+                }
+                Ok(Detected::Paid) => {
+                    // Notify Dart: payment detected
+                    let _ = sink.add(MintQuote {
+                        id: quote.id.clone(),
+                        request: quote.request.clone(),
+                        amount: quote.amount.map(|a| a.into()),
+                        expiry: Some(quote.expiry),
+                        state: CdkMintQuoteState::Paid.into(),
+                        token: None,
+                        error: None,
+                        transaction_id: None,
+                    });
+
+                    // Mint the ecash tokens (outside timeout)
+                    match _self
+                        .inner
+                        .mint(&quote.id, SplitTarget::None, None)
+                        .await
+                    {
+                        Ok(mint_proofs) => {
+                            let tx_id = match TransactionId::try_from(
+                                mint_proofs.clone(),
+                            ) {
+                                Ok(id) => Some(id.to_string()),
+                                Err(e) => {
+                                    info!("Failed to compute mint tx ID: {e}");
+                                    None
+                                }
+                            };
+
+                            let mint_amount =
+                                mint_proofs.total_amount().unwrap_or_default();
                             let _ = sink.add(MintQuote {
-                                id: quote.id.clone(),
-                                request: quote.request.clone(),
+                                id: quote.id,
+                                request: quote.request,
+                                amount: Some(mint_amount.into()),
+                                expiry: Some(quote.expiry),
+                                state: CdkMintQuoteState::Issued.into(),
+                                token: Token::try_from(CdkToken::new(
+                                    mint_url,
+                                    mint_proofs,
+                                    None,
+                                    unit,
+                                ))
+                                .ok(),
+                                error: None,
+                                transaction_id: tx_id,
+                            });
+                            _self.update_balance_streams().await;
+                        }
+                        Err(e) => {
+                            let _ = sink.add(MintQuote {
+                                id: quote.id,
+                                request: quote.request,
                                 amount: quote.amount.map(|a| a.into()),
                                 expiry: Some(quote.expiry),
-                                state: CdkMintQuoteState::Paid.into(),
+                                state: MintQuoteState::Error,
                                 token: None,
-                                error: None,
+                                error: Some(e.to_string()),
+                                transaction_id: None,
                             });
-                            match _self
-                                .inner
-                                .mint(&quote.id, SplitTarget::None, None)
-                                .await
-                            {
-                                Ok(mint_proofs) => {
-                                    let mint_amount =
-                                        mint_proofs.total_amount().unwrap_or_default();
-                                    let _ = sink.add(MintQuote {
-                                        id: quote.id,
-                                        request: quote.request,
-                                        amount: Some(mint_amount.into()),
-                                        expiry: Some(quote.expiry),
-                                        state: CdkMintQuoteState::Issued.into(),
-                                        token: Token::try_from(CdkToken::new(
-                                            mint_url,
-                                            mint_proofs,
-                                            None,
-                                            unit,
-                                        ))
-                                        .ok(),
-                                        error: None,
-                                    });
-                                    _self.update_balance_streams().await;
-                                    break;
-                                }
-                                Err(e) => {
-                                    let _ = sink.add(MintQuote {
-                                        id: quote.id,
-                                        request: quote.request,
-                                        amount: quote.amount.map(|a| a.into()),
-                                        expiry: Some(quote.expiry),
-                                        state: MintQuoteState::Error,
-                                        token: None,
-                                        error: Some(e.to_string()),
-                                    });
-                                    break;
-                                }
-                            }
                         }
-                    },
-                    Err(e) => {
-                        let _ = sink.add(MintQuote {
-                            id: quote.id,
-                            request: quote.request,
-                            amount: quote.amount.map(|a| a.into()),
-                            expiry: Some(quote.expiry),
-                            state: MintQuoteState::Error,
-                            token: None,
-                            error: Some(e.to_string()),
-                        });
-                        break;
                     }
                 }
+                Ok(Detected::Issued) => {
+                    // Already issued (recovered from previous session)
+                    let _ = sink.add(MintQuote {
+                        id: quote.id.clone(),
+                        request: quote.request.clone(),
+                        amount: quote.amount.map(|a| a.into()),
+                        expiry: Some(quote.expiry),
+                        state: CdkMintQuoteState::Issued.into(),
+                        token: None,
+                        error: None,
+                        transaction_id: None,
+                    });
+                    _self.update_balance_streams().await;
+                }
             }
         });
         Ok(())
@@ -363,6 +491,39 @@ impl Wallet {
         Ok(())
     }
 
+    // === Reclaim orphaned proofs ===
+
+    /// Check pending-spent proofs with the mint and revert unspent ones.
+    /// Returns the number of proofs recovered.
+    pub async fn reclaim_pending_proofs(&self) -> Result<u64, Error> {
+        let pending = self.inner.get_pending_spent_proofs().await?;
+        if pending.is_empty() {
+            return Ok(0);
+        }
+
+        // check_proofs_spent: queries mint AND removes spent proofs from local DB
+        let states = self.inner.check_proofs_spent(pending).await?;
+
+        // Collect Y values of proofs the mint says are NOT spent
+        // Only reclaim proofs the mint explicitly reports as Unspent.
+        // Pending proofs (still being processed) must not be unreserved.
+        let unspent_ys: Vec<PublicKey> = states
+            .into_iter()
+            .filter(|s| s.state == ProofState::Unspent)
+            .map(|s| s.y)
+            .collect();
+
+        let count = unspent_ys.len() as u64;
+        if count > 0 {
+            // Revert from PendingSpent to Unspent
+            self.inner.unreserve_proofs(unspent_ys).await?;
+        }
+
+        // Always refresh: check_proofs_spent may have removed spent proofs
+        self.update_balance_streams().await;
+        Ok(count)
+    }
+
     // === Utility ===
 
     pub async fn is_token_spent(&self, token: Token) -> Result<bool, Error> {
@@ -383,7 +544,7 @@ impl Wallet {
 
     // === Internal helpers ===
 
-    fn mint_url(&self) -> Result<MintUrl, Error> {
+    pub(crate) fn mint_url(&self) -> Result<MintUrl, Error> {
         Ok(MintUrl::from_str(&self.mint_url)?)
     }
 
@@ -391,7 +552,7 @@ impl Wallet {
         CurrencyUnit::from_str(&self.unit).unwrap_or(CurrencyUnit::Custom(self.unit.clone()))
     }
 
-    async fn update_balance_streams(&self) {
+    pub(crate) async fn update_balance_streams(&self) {
         let balance = self
             .inner
             .total_balance()
@@ -406,6 +567,15 @@ impl Wallet {
 // Types
 // ========================================================================
 
+/// Result of a confirmed send, carrying both the ecash token and the
+/// deterministic transaction ID so Dart can save metadata without a racy
+/// listTransactions lookup.
+pub struct SendResult {
+    pub token: Token,
+    /// Deterministic transaction ID (None if computation failed)
+    pub transaction_id: Option<String>,
+}
+
 pub struct MintQuote {
     pub id: String,
     pub request: String,
@@ -414,6 +584,8 @@ pub struct MintQuote {
     pub state: MintQuoteState,
     pub token: Option<Token>,
     pub error: Option<String>,
+    /// Deterministic transaction ID (set when proofs are available, typically on Issued)
+    pub transaction_id: Option<String>,
 }
 
 impl From<CdkMintQuote> for MintQuote {
@@ -426,6 +598,7 @@ impl From<CdkMintQuote> for MintQuote {
             state: quote.state.into(),
             token: None,
             error: None,
+            transaction_id: None,
         }
     }
 }

windows/runner/Runner.rc

@@ -89,11 +89,11 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "com.example" "\0"
+            VALUE "CompanyName", "ElCaju" "\0"
             VALUE "FileDescription", "elcaju" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
             VALUE "InternalName", "elcaju" "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2026 com.example. All rights reserved." "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2026 ElCaju. All rights reserved." "\0"
             VALUE "OriginalFilename", "elcaju.exe" "\0"
             VALUE "ProductName", "elcaju" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"