get rid of unified receive

MutinyWallet · Apr 22, 2024 · eb21126 · eb21126
1 parent 44b86e6
commit eb21126
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 112 deletions.
diff --git a/e2e/fedimint.spec.ts b/e2e/fedimint.spec.ts
@@ -77,10 +77,10 @@ test("fedmint join, receive, send", async ({ page }) => {
 
     const value = await qrCode.getAttribute("value");
 
-    // The SVG's value property includes "bitcoin:t"
-    expect(value).toContain("bitcoin:t");
+    // The SVG's value property includes "bitcoin:l"
+    expect(value).toContain("lightning:l");
 
-    const lightningInvoice = value?.split("lightning=")[1];
+    const lightningInvoice = value?.split("lightning:")[1];
 
     // Post the lightning invoice to the server
     const _response = await fetch(

diff --git a/e2e/roundtrip.spec.ts b/e2e/roundtrip.spec.ts
@@ -51,10 +51,10 @@ test("rountrip receive and send", async ({ page }) => {
 
     const value = await qrCode.getAttribute("value");
 
-    // The SVG's value property includes "bitcoin:t"
-    expect(value).toContain("bitcoin:t");
+    // The SVG's value property includes "lightning:l"
+    expect(value).toContain("lightning:l");
 
-    const lightningInvoice = value?.split("lightning=")[1];
+    const lightningInvoice = value?.split("lightning:")[1];
 
     // Post the lightning invoice to the server
     const _response = await fetch(

diff --git a/public/i18n/en.json b/public/i18n/en.json
@@ -108,13 +108,10 @@
     "receive_add_the_sender": "Add the sender for your records",
     "keep_mutiny_open": "Keep Mutiny open to complete the payment.",
     "choose_payment_format": "Choose payment format",
-    "unified_label": "Unified",
-    "unified_caption": "Combines a bitcoin address and a lightning invoice. Sender chooses payment method.",
     "lightning_label": "Lightning invoice",
     "lightning_caption": "Ideal for small transactions. Usually lower fees than on-chain.",
     "onchain_label": "Bitcoin address",
     "onchain_caption": "On-chain, just like Satoshi did it. Ideal for very large transactions.",
-    "unified_setup_fee": "A lightning setup fee of {{amount}} SATS will be charged if paid over lightning.",
     "lightning_setup_fee": "A lightning setup fee of {{amount}} SATS will be charged for this receive.",
     "amount": "Amount",
     "fee": "+ Fee",
@@ -123,8 +120,8 @@
     "channel_size": "Channel size",
     "channel_reserve": "- Channel reserve",
     "error_under_min_lightning": "Defaulting to On-chain. Amount is too small for your initial Lightning receive.",
-    "error_creating_unified": "Defaulting to On-chain. Something went wrong when creating the unified address",
-    "error_creating_address": "Something went wrong when creating the on-chain address",
+    "error_creating_unified": "Defaulting to On-chain. Something went wrong when creating the Lightning invoice.",
+    "error_creating_address": "Something went wrong when creating the on-chain address.",
     "amount_editable": {
       "receive_too_small": "Your first receive needs to be {{amount}} SATS or greater.",
       "setup_fee_lightning": "A lightning setup fee will be charged if paid over lightning.",
@@ -142,15 +139,15 @@
     "integrated_qr": {
       "onchain": "On-chain",
       "lightning": "Lightning",
-      "unified": "Unified",
       "gift": "Lightning Gift"
     },
     "remember_choice": "Remember my choice next time",
     "what_for": "What's this for?",
     "method_help": {
       "title": "Receive Method",
       "body": "Lightning receives under 200,000 sats go into your federation by default. Anything higher than that goes into a lightning channel."
-    }
+    },
+    "recieve_error": "Unable to create an invoice."
   },
   "send": {
     "search": {

diff --git a/src/components/IntegratedQR.tsx b/src/components/IntegratedQR.tsx
@@ -39,16 +39,6 @@ function KindIndicator(props: { kind: ReceiveFlavor | "gift" | "lnAddress" }) {
                     </h3>
                     <Zap class="h-4 w-4" />
                 </Match>
-
-                <Match when={props.kind === "unified"}>
-                    <h3 class="font-semibold">
-                        {i18n.t("receive.integrated_qr.unified")}
-                    </h3>
-                    <div class="flex gap-1">
-                        <Zap class="h-4 w-4" />
-                        <Link class="h-4 w-4" />
-                    </div>
-                </Match>
             </Switch>
         </div>
     );