Merge pull request #729 from getAlby/fix/keysend-webln

Fix/keysend-webln
getAlby · Mar 23, 2022 · 93c9cbe · 93c9cbe
2 parents 0081fbe + 0e89a17
commit 93c9cbe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/extension/background-script/actions/ln/keysend.ts b/src/extension/background-script/actions/ln/keysend.ts
@@ -7,7 +7,10 @@ import utils from "../../../../common/lib/utils";
 export default async function keysend(message: Message) {
   PubSub.publish(`ln.keysend.start`, message);
   const { destination, amount, customRecords } = message.args;
-  if (typeof destination !== "string" || typeof amount !== "string") {
+  if (
+    typeof destination !== "string" ||
+    (typeof amount !== "string" && typeof amount !== "number")
+  ) {
     return {
       error: "destination or amount missing.",
     };
@@ -19,7 +22,7 @@ export default async function keysend(message: Message) {
   try {
     response = await connector.keysend({
       pubkey: destination,
-      amount: parseInt(amount),
+      amount: parseInt(amount as string),
       customRecords: customRecords as Record<string, string>,
     });
   } catch (e) {

diff --git a/src/extension/background-script/actions/webln/keysendOrPrompt.ts b/src/extension/background-script/actions/webln/keysendOrPrompt.ts
@@ -8,13 +8,15 @@ import { checkAllowance } from "./sendPaymentOrPrompt";
 const keysendOrPrompt = async (message: Message) => {
   const destination = message.args.destination;
   const amount = message.args.amount;
-  if (typeof destination !== "string" || typeof amount !== "string") {
+  if (
+    typeof destination !== "string" ||
+    (typeof amount !== "string" && typeof amount !== "number")
+  ) {
     return {
       error: "Destination or amount missing.",
     };
   }
-
-  if (await checkAllowance(message.origin.host, parseInt(amount))) {
+  if (await checkAllowance(message.origin.host, parseInt(amount as string))) {
     return keysendWithAllowance(message);
   } else {
     return keysendWithPrompt(message);

diff --git a/src/extension/ln/webln/index.ts b/src/extension/ln/webln/index.ts
@@ -8,8 +8,8 @@ type RequestInvoiceArgs = {
 
 type KeysendArgs = {
   destination: string;
-  customRecords: Record<string, string>;
-  amount: string;
+  customRecords?: Record<string, string>;
+  amount: string | number;
 };
 
 export default class WebLNProvider {