decoding payment request descriptions properly

Author: kaplanmaxe

apps/desktop/rpc.proto

@@ -602,4 +602,7 @@ message PayReq {
     string destination = 1 [json_name = "destination"];
     string payment_hash = 2 [json_name = "payment_hash"];
     int64 num_satoshis = 3 [json_name = "num_satoshis"];
+    uint32 timestamp = 4 [json_name = "timestamp"];
+    uint32 expiry = 5 [json_name = "expiry"];
+    string description = 6 [json_name = "description"];
 }

packages/lightning-core/pay/index.js

@@ -27,7 +27,16 @@ export const Pay = ({ onMakePayment, onDecodePaymentRequest, onEditForm,
       required: true,
       component: CurrencyInput,
     },
+    {
+      name: 'description',
+      placeholder: 'Description',
+      component: Input,
+      hide: true,
+      disabled: true,
+    },
   ]
+  // If current form is a payment request
+  let requestActive = false
 
   const menu = new Menu()
   menu.append(new MenuItem({ label: 'Paste', role: 'paste' }))
@@ -47,16 +56,34 @@ export const Pay = ({ onMakePayment, onDecodePaymentRequest, onEditForm,
     console.log('error', errors)
   }
 
-  const handleChange = (change) => {
+  // Clear all fields in form
+  const clearForm = () => {
+    onEditForm('pay', {
+      address: '',
+      amount: '',
+      description: '',
+    })
     fields[1].disabled = false
+    fields[2].hide = true
+  }
+
+  // Handle change on payment form
+  const handleChange = (change) => {
+    if (requestActive === true) {
+      clearForm()
+      requestActive = false
+    }
     if (change.address) {
       const paymentRequest = sanitizePaymentRequest(change.address)
       onDecodePaymentRequest({ paymentRequest })
         .then((decoded) => {
+          requestActive = true
           const amount = decoded.num_satoshis
+          const description = decoded.description
           // Disable the amount field when using payment requests
           fields[1].disabled = true
-          onEditForm('pay', { amount })
+          if (description) { fields[2].hide = false }
+          onEditForm('pay', { amount, description: decoded.description })
         })
         .catch(console.error)
     }

packages/lightning-forms/components/Field.js

@@ -2,7 +2,7 @@ import React from 'react'
 import reactCSS from 'reactcss'
 
 export const Field = ({ name, type, placeholder, value, component, onChange,
-  disabled, errorText, error }) => {
+  disabled, errorText, error, hide }) => {
   const styles = reactCSS({
     'default': {
       field: {
@@ -25,16 +25,18 @@ export const Field = ({ name, type, placeholder, value, component, onChange,
 
   return (
     <div style={ styles.field }>
-      <Component
-        style={ styles.field }
-        name={ name }
-        type={ type }
-        placeholder={ placeholder }
-        value={ value }
-        disabled={ disabled }
-        onChange={ handleChange }
-        outlineColor={ error && 'rgba(213, 61, 80, 0.3)' }
-      />
+      {!hide && (
+        <Component
+          style={ styles.field }
+          name={ name }
+          type={ type }
+          placeholder={ placeholder }
+          value={ value }
+          disabled={ disabled }
+          onChange={ handleChange }
+          outlineColor={ error && 'rgba(213, 61, 80, 0.3)' }
+        />
+      )}
       { errorText ? <div style={ styles.error }>{ errorText }</div> : null }
     </div>
   )