fix(sendcoins): merge master changes into branch

app/reducers/form.js

@@ -101,7 +101,6 @@ const ACTION_HANDLERS = {
 // ------------------------------------
 const formSelectors = {}
 const paymentRequestSelector = state => state.form.payment_request
-const paymentTypeSelector = state => state.form.paymentType
 
 formSelectors.isOnchain = createSelector(
   paymentRequestSelector,

app/routes/app/components/components/Form/Form.js

@@ -42,6 +42,7 @@ const Form = ({
                 invoiceAmount={formInvoice.amount}
                 onchainAmount={onchainAmount}
                 setOnchainAmount={setOnchainAmount}
+                amount={formInvoice.amount}
                 payment_request={payment_request}
                 setPaymentRequest={setPaymentRequest}
                 fetchInvoice={fetchInvoice}
@@ -53,6 +54,9 @@ const Form = ({
                 close={close}
                 isOnchain={isOnchain}
                 isLn={isLn}
+                currency={currency}
+                crypto={crypto}
+                close={close}
               />
               :
               <Request

app/routes/app/components/components/Form/components/Pay/Pay.js

@@ -124,21 +124,13 @@ class Pay extends Component {
 }
 
 Pay.propTypes = {
-  amount: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.number
-  ]),
-  setOnchainAmount: PropTypes.func.isRequired,
+  amount: PropTypes.string.isRequired,
   setPaymentRequest: PropTypes.func.isRequired,
   fetchInvoice: PropTypes.func.isRequired,
   payInvoice: PropTypes.func.isRequired,
-  sendCoins: PropTypes.func.isRequired,
-  currentTicker: PropTypes.object.isRequired,
   currency: PropTypes.string.isRequired,
   crypto: PropTypes.string.isRequired,
-  close: PropTypes.func.isRequired,
-  isOnchain: PropTypes.bool.isRequired,
-  isLn: PropTypes.bool.isRequired
+  close: PropTypes.func.isRequired
 }
 
 export default Pay

package.json

@@ -8,7 +8,11 @@
     "build-dll": "cross-env NODE_ENV=development node --trace-warnings -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.renderer.dev.dll.js --colors",
     "build-main": "cross-env NODE_ENV=production node --trace-warnings -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.main.prod.js --colors",
     "build-renderer": "cross-env NODE_ENV=production node --trace-warnings -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.renderer.prod.js --colors",
+<<<<<<< HEAD
     "dev": "cross-env START_HOT=1 concurrently \"npm run start-renderer-dev\"",
+=======
+    "dev": "cross-env START_HOT=1 concurrently \"npm run start-renderer-dev\" \"npm run lnd\"",
+>>>>>>> dabc626d3c649201710eaa53f8caeda4f512a2a7
     "flow": "flow",
     "flow-typed": "rimraf flow-typed/npm && flow-typed install --overwrite || true",
     "lint": "eslint --cache --format=node_modules/eslint-formatter-pretty .",