From 3fee043b4702a75dfca5fbe7c5deea2678e6aab5 Mon Sep 17 00:00:00 2001
From: Jack Mallers <jimmymowschess@gmail.com>
Date: Fri, 29 Sep 2017 13:18:54 -0500
Subject: [PATCH] fix(inputCaption): fix input caption selector

---
 app/components/Form/PayForm.js            |  4 ++++
 app/reducers/payform.js                   | 10 +++++++---
 app/routes/app/components/App.js          |  1 -
 app/routes/app/containers/AppContainer.js |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/components/Form/PayForm.js b/app/components/Form/PayForm.js
index d7fc6e89..7a46f994 100644
--- a/app/components/Form/PayForm.js
+++ b/app/components/Form/PayForm.js
@@ -20,6 +20,7 @@ class PayForm extends Component {
       onPaySubmit
     } = this.props
 
+    console.log('inputCaption: ', inputCaption)
     return (
       <div className={styles.container}>
         <section className={`${styles.amountContainer} ${isLn ? styles.ln : ''}`}>
@@ -43,6 +44,9 @@ class PayForm extends Component {
           />
         </section>
         <div className={styles.inputContainer}>
+          <div className={styles.info}>
+            <span>{inputCaption}</span>
+          </div>
           <aside className={styles.paymentIcon}>
             {(() => {
               if (isOnchain) {
diff --git a/app/reducers/payform.js b/app/reducers/payform.js
index 382d1ee1..f2d5a1ce 100644
--- a/app/reducers/payform.js
+++ b/app/reducers/payform.js
@@ -51,9 +51,9 @@ const ACTION_HANDLERS = {
 // Selector
 // ------------------------------------
 const payFormSelectors = {}
-const payAmountSelector = state => state.payform.payInput
+const payAmountSelector = state => state.payform.amount
 const payInputSelector = state => state.payform.payInput
-const currencySelector = state => state.ticker.currencySelector
+const currencySelector = state => state.ticker.currency
 
 payFormSelectors.isOnchain = createSelector(
   payInputSelector,
@@ -80,7 +80,11 @@ payFormSelectors.inputCaption = createSelector(
   payAmountSelector,
   currencySelector,
   (isOnchain, isLn, amount, currency) => {
-    if (!isOnchain || !isLn) { return }
+    console.log('isOnchain: ', isOnchain)
+    console.log('isLn: ', isLn)
+    console.log('amount: ', amount)
+    console.log('currency: ', currency)
+    if (!isOnchain && !isLn) { return }
 
     if (isOnchain) {
       return `You're about to send ${amount} ${currency.toUpperCase()} on-chain which should take around 10 minutes`
diff --git a/app/routes/app/components/App.js b/app/routes/app/components/App.js
index e9021e6b..f85794f8 100644
--- a/app/routes/app/components/App.js
+++ b/app/routes/app/components/App.js
@@ -48,7 +48,6 @@ class App extends Component {
       children
     } = this.props
 
-    console.log('formProps: ', this.props.formProps)
     if (!currentTicker) { return <div>Loading...</div> }
 
     return (
diff --git a/app/routes/app/containers/AppContainer.js b/app/routes/app/containers/AppContainer.js
index c845dec9..559d4d71 100644
--- a/app/routes/app/containers/AppContainer.js
+++ b/app/routes/app/containers/AppContainer.js
@@ -66,7 +66,7 @@ const mapStateToProps = state => ({
   currentTicker: tickerSelectors.currentTicker(state),
   isOnchain: payFormSelectors.isOnchain(state),
   isLn: payFormSelectors.isLn(state),
-  inputCaption: payFormSelectors.isLn(state)
+  inputCaption: payFormSelectors.inputCaption(state)
 })
 
 const mergeProps = (stateProps, dispatchProps, ownProps) => {