Check for valid bitcoin address before navigating to pay bitcoin view

Author: tanx

src/action/payment.js

@@ -1,5 +1,12 @@
 import { PREFIX_URI } from '../config';
-import { toSatoshis, toAmount, parseSat, isValidUri, nap } from '../helper';
+import {
+  toSatoshis,
+  toAmount,
+  parseSat,
+  isLnUri,
+  isAddress,
+  nap,
+} from '../helper';
 import * as log from './log';
 
 class PaymentAction {
@@ -14,7 +21,7 @@ class PaymentAction {
   listenForUrl(ipcRenderer) {
     ipcRenderer.on('open-url', async (event, url) => {
       log.info('open-url', url);
-      if (!isValidUri(url)) {
+      if (!isLnUri(url)) {
         return;
       }
       while (!this._store.lndReady) {
@@ -48,8 +55,10 @@ class PaymentAction {
     }
     if (await this.decodeInvoice({ invoice: this._store.payment.address })) {
       this._nav.goPayLightningConfirm();
-    } else {
+    } else if (isAddress(this._store.payment.address)) {
       this._nav.goPayBitcoin();
+    } else {
+      this._notification.display({ msg: 'Invalid invoice or address' });
     }
   }
 

test/unit/action/payment.spec.js

@@ -118,10 +118,18 @@ describe('Action Payments Unit Tests', () => {
       expect(nav.goPayLightningConfirm, 'was called once');
     });
 
-    it('should set response to null on error', async () => {
+    it('should notify if not bitcoin address', async () => {
       store.payment.address = 'some-address';
       payment.decodeInvoice.resolves(false);
       await payment.checkType();
+      expect(nav.goPayBitcoin, 'was not called');
+      expect(notification.display, 'was called once');
+    });
+
+    it('should navigate to bitcoin for valid address', async () => {
+      store.payment.address = 'rfu4i1Mo2NF7TQsN9bMVLFSojSzcyQCEH5';
+      payment.decodeInvoice.resolves(false);
+      await payment.checkType();
       expect(nav.goPayBitcoin, 'was called once');
     });
   });