Fix issue where writing 500 yeild 0500.

Author: emiljoha

src/action/payment.js

@@ -169,6 +169,7 @@ class PaymentAction {
         this._store.payment.amount === '0' ||
         this._store.payment.amount === 0
       ) {
+        this._store.payment.amount = null;
         this._nav.goPayLightningSupplyAmount();
       } else {
         this._nav.goPayLightningConfirm();
@@ -180,6 +181,15 @@ class PaymentAction {
     }
   }
 
+  async checkAmountSuppliedAndGoPayLightningConfirm() {
+    if (!this._store.payment.amount) {
+      return this._notification.display({ msg: 'Enter an invoice or address' });
+    } else {
+      this.reEstimateLightningFee();
+      this._nav.goPayLightningConfirm();
+    }
+  }
+
   /**
    * Attempt to decode a lightning invoice using the lnd grpc api. If it is
    * an invoice the amount and note store values will be set and the lightning
@@ -212,11 +222,12 @@ class PaymentAction {
    * @param  {number} options.satAmt      The amount to be payed in satoshis
    * @return {Promise<undefined>}
    */
-  async estimateLightningFeeForAmount({ amount }) {
+  async reEstimateLightningFee() {
     try {
       const request = await this._grpc.sendCommand('decodePayReq', {
         payReq: this._store.payment.address,
       });
+      const amount = this._store.payment.amount;
       this.estimateLightningFee({
         destination: request.destination,
         satAmt: toSatoshis(amount, this._store.settings),

src/view/pay-lightning-supply-amount-mobile.js

@@ -47,7 +47,7 @@ const PayLightningSupplyAmountView = ({ store, nav, payment }) => (
             value={store.invoice.amount}
             onChangeText={amount => payment.setAmount({ amount })}
             onSubmitEditing={() =>
-              payment.estimateLightningFeeForAmount(payment.amount)
+              payment.checkAmountSuppliedAndGoPayLightningConfirm()
             }
           />
           <BalanceLabelUnit style={styles.unit}>
@@ -67,7 +67,9 @@ const PayLightningSupplyAmountView = ({ store, nav, payment }) => (
         </FormSubText>
       </Card>
     </MainContent>
-    <SmallGlasButton onPress={() => nav.goPayLightningConfirm()}>
+    <SmallGlasButton
+      onPress={() => payment.checkAmountSuppliedAndGoPayLightningConfirm()}
+    >
       Pay
     </SmallGlasButton>
   </Background>

src/view/pay-lightning-supply-amount.js

@@ -54,7 +54,7 @@ const PayLightningSupplyAmountView = ({ store, nav, payment }) => (
             value={store.payment.amount}
             onChangeText={amount => payment.setAmount({ amount })}
             onSubmitEditing={() =>
-              payment.estimateLightningFeeForAmount(payment.amount)
+              payment.checkAmountSuppliedAndGoPayLightningConfirm()
             }
           />
           <BalanceLabelUnit style={styles.unit}>
@@ -74,7 +74,7 @@ const PayLightningSupplyAmountView = ({ store, nav, payment }) => (
         </FormStretcher>
         <PillButton
           style={styles.nextBtn}
-          onPress={() => nav.goPayLightningConfirm()}
+          onPress={() => payment.checkAmountSuppliedAndGoPayLightningConfirm()}
         >
           Pay
         </PillButton>