Merge branch 'getAlby#2573' of https://github.com/Rithvik-padma/light…

…ning-browser-extension into getAlby#2573
Rithvik-padma · Dec 23, 2023 · ab9deaf · ab9deaf
2 parents 0e3f962 + 4555ba5
commit ab9deaf
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 35 deletions.
diff --git a/src/app/components/TipCard/index.test.tsx b/src/app/components/TipCard/index.test.tsx
@@ -1,17 +1,17 @@
 import { render, screen } from "@testing-library/react";
 import { MemoryRouter } from "react-router-dom";
-import BuyBitcoinTipCardIcon from "~/app/icons/BuyBitcoinTipCardIcon";
 
+import MnemonicTipCardIcon from "~/app/icons/MnemonicTipCardIcon";
 import type { Props } from "./index";
 import TipCard from "./index";
 
 const props: Props = {
   title: "Card Title",
   description: "Card description",
   handleClose: () => ({}),
-  arrowClassName: "text-orange-500",
-  backgroundIcon: <BuyBitcoinTipCardIcon />,
-  className: "border-orange-500",
+  arrowClassName: "text-purple-500",
+  backgroundIcon: <MnemonicTipCardIcon />,
+  className: "border-purple-500",
 };
 
 describe("CloseableCard", () => {

diff --git a/src/app/icons/BuyBitcoinTipCardIcon.tsx b/src/app/icons/BuyBitcoinTipCardIcon.tsx
diff --git a/src/app/router/Welcome/Welcome.tsx b/src/app/router/Welcome/Welcome.tsx
@@ -64,7 +64,7 @@ function Layout() {
   return (
     <div className="flex justify-center items-center min-h-screen">
       <div className="w-full">
-        <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
+        <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 mb-4">
           <div className="text-center font-serif font-medium text-2xl mt-8 dark:text-white">
             <p>
               {t("welcome.title")}

diff --git a/src/app/screens/Discover/index.tsx b/src/app/screens/Discover/index.tsx
@@ -19,7 +19,7 @@ function Discover() {
           <p className="mb-6 text-gray-500 dark:text-neutral-500">
             {t("discover.tips.description")}
           </p>
-          <div className="mb-6 flex gap-4">
+          <div className="mb-6 flex sm:flex-row flex-col gap-4">
             <Tips />
           </div>
         </>

diff --git a/src/app/screens/connectors/ConnectAlby/index.tsx b/src/app/screens/connectors/ConnectAlby/index.tsx
@@ -80,7 +80,6 @@ export default function ConnectAlby() {
       disabled={loading}
       primary
       flex
-      className="w-64"
       onClick={connectAlby}
     />
   );

diff --git a/src/extension/background-script/connectors/galoy.ts b/src/extension/background-script/connectors/galoy.ts
@@ -273,6 +273,21 @@ class Galoy implements Connector {
             errors {
               message
             }
+            transaction {
+              settlementVia {
+                ... on SettlementViaLn {
+                  ${
+                    this.config.apiCompatibilityMode
+                      ? "paymentSecret"
+                      : "preImage"
+                  }
+                }
+                ... on SettlementViaIntraLedger {
+                  counterPartyUsername
+                  counterPartyWalletId
+                }
+              }
+            }
           }
         }
       `,
@@ -295,6 +310,25 @@ class Galoy implements Connector {
         throw new Error(errs[0].message || JSON.stringify(errs));
       }
 
+      const transaction = data.lnInvoicePaymentSend.transaction;
+      let preimageMessage = "No preimage received";
+
+      if (transaction && transaction.settlementVia) {
+        if (
+          "preImage" in transaction.settlementVia ||
+          "paymentSecret" in transaction.settlementVia
+        ) {
+          preimageMessage =
+            transaction.settlementVia.preImage ||
+            transaction.settlementVia.paymentSecret;
+        } else if (
+          "counterPartyUsername" in transaction.settlementVia ||
+          "counterPartyWalletId" in transaction.settlementVia
+        ) {
+          preimageMessage = "No preimage, the payment was settled intraledger";
+        }
+      }
+
       switch (data.lnInvoicePaymentSend.status) {
         case "ALREADY_PAID":
           throw new Error("Invoice was already paid.");
@@ -311,7 +345,7 @@ class Galoy implements Connector {
         default:
           return {
             data: {
-              preimage: "No preimage received",
+              preimage: preimageMessage,
               paymentHash,
               route: { total_amt: amountInSats, total_fees: 0 },
             },