Incorporate sendAll logic into payment actions.

1. If the user edits the payment amount, reset sendAll to false.
2. Factor out _sendPayment into a helper and set the payment amount to zero if sendAll is true.

Author: valentinewallace

src/action/payment.js

@@ -122,6 +122,7 @@ class PaymentAction {
    */
   setAmount({ amount }) {
     this._store.payment.amount = amount;
+    this._store.payment.sendAll = false;
   }
 
   /**
@@ -139,6 +140,7 @@ class PaymentAction {
     if (await this.decodeInvoice({ invoice: this._store.payment.address })) {
       this._nav.goPayLightningConfirm();
     } else if (isAddress(this._store.payment.address)) {
+      this._store.payment.sendAll = false;
       this._nav.goPayBitcoin();
     } else {
       this._notification.display({ msg: 'Invalid invoice or address' });
@@ -238,11 +240,7 @@ class PaymentAction {
     }, PAYMENT_TIMEOUT);
     this._nav.goWait();
     try {
-      const { payment, settings } = this._store;
-      await this._grpc.sendCommand('sendCoins', {
-        addr: payment.address,
-        amount: toSatoshis(payment.amount, settings),
-      });
+      await this._sendPayment();
       this._nav.goPayBitcoinDone();
     } catch (err) {
       this._nav.goPayBitcoinConfirm();
@@ -252,6 +250,16 @@ class PaymentAction {
     }
   }
 
+  async _sendPayment() {
+    const { payment, settings } = this._store;
+    let amount = payment.sendAll ? 0 : toSatoshis(payment.amount, settings);
+    await this._grpc.sendCommand('sendCoins', {
+      addr: payment.address,
+      amount,
+      sendAll: payment.sendAll,
+    });
+  }
+
   /**
    * Send the amount specified in the invoice as a lightning transaction and
    * display the wait screen while the payment confirms.

test/unit/action/payment.spec.js

@@ -209,6 +209,13 @@ describe('Action Payments Unit Tests', () => {
       payment.setAmount({ amount: 'some-amount' });
       expect(store.payment.amount, 'to equal', 'some-amount');
     });
+
+    it('should reset sendAll if set', () => {
+      store.payment.sendAll = true;
+      payment.setAmount({ amount: 'some-amount' });
+      expect(store.payment.amount, 'to equal', 'some-amount');
+      expect(store.payment.sendAll, 'to be false');
+    });
   });
 
   describe('checkType()', () => {
@@ -305,6 +312,23 @@ describe('Action Payments Unit Tests', () => {
       expect(grpc.sendCommand, 'was called with', 'sendCoins', {
         addr: 'some-address',
         amount: 1000,
+        sendAll: false,
+      });
+      expect(nav.goPayBitcoinDone, 'was called once');
+      expect(notification.display, 'was not called');
+    });
+
+    it('should set amount to 0 on sendAll', async () => {
+      store.payment.sendAll = true;
+      store.payment.amount = '0.00001';
+      store.payment.address = 'some-address';
+      grpc.sendCommand.withArgs('sendCoins').resolves();
+      await payment.payBitcoin();
+      expect(nav.goWait, 'was called once');
+      expect(grpc.sendCommand, 'was called with', 'sendCoins', {
+        addr: 'some-address',
+        amount: 0,
+        sendAll: true,
       });
       expect(nav.goPayBitcoinDone, 'was called once');
       expect(notification.display, 'was not called');