feat: nest webln calls under the webln/ namespace

getAlby · Mar 31, 2022 · ad399ca · ad399ca
1 parent 48b8b1d
commit ad399ca
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/src/app/router/Prompt/Prompt.tsx b/src/app/router/Prompt/Prompt.tsx
@@ -63,7 +63,7 @@ class Prompt extends Component<
                   element={<Navigate to={`/${this.state.type}`} replace />}
                 />
                 <Route
-                  path="enable"
+                  path="webln/enable"
                   element={<Enable origin={this.state.origin} />}
                 />
                 <Route

diff --git a/src/extension/background-script/router.ts b/src/extension/background-script/router.ts
@@ -9,17 +9,17 @@ import * as webln from "./actions/webln";
 
 // TODO: potential nesting/grouping of actions for better organization
 const routes = {
-  /*
   webln: {
     enable: allowances.enable,
     getInfo: ln.getInfo,
-    sendPayment: ln.sendPayment,
+    sendPaymentOrPrompt: webln.sendPaymentOrPrompt,
+    keysendOrPrompt: webln.keysendOrPrompt,
+    lnurl: lnurl,
+    makeInvoice: ln.makeInvoice,
+    signMessage: ln.signMessage,
+    verifyMessage: ln.verifyMessage,
   },
-  ln: ln,
-  accounts: accounts,
-  */
   addAllowance: allowances.add,
-  enable: allowances.enable,
   getAllowance: allowances.get,
   getAllowanceById: allowances.getById,
   listAllowances: allowances.list,
@@ -29,16 +29,11 @@ const routes = {
   isUnlocked: accounts.isUnlocked,
   unlock: accounts.unlock,
   getInfo: ln.getInfo,
-  lnurl,
   lnurlPay,
-  sendPaymentOrPrompt: webln.sendPaymentOrPrompt,
-  keysendOrPrompt: webln.keysendOrPrompt,
-  signMessageOrPrompt: webln.signMessageOrPrompt,
   sendPayment: ln.sendPayment,
   keysend: ln.keysend,
   checkPayment: ln.checkPayment,
   signMessage: ln.signMessage,
-  verifyMessage: ln.verifyMessage,
   makeInvoice: ln.makeInvoice,
   getBalance: ln.getBalance,
   getPayments: payments.all,

diff --git a/src/extension/content-script/index.js b/src/extension/content-script/index.js
@@ -42,7 +42,7 @@ if (shouldInject()) {
         return;
       }
       const messageWithOrigin = {
-        type: ev.data.type, // TODO: rename type to action
+        type: `webln/${ev.data.type}`, // TODO: rename type to action
         args: ev.data.args,
         application: "LBE",
         public: true, // indicate that this is a public call from the content script