diff --git a/app/components/Activity/PaymentModal.js b/app/components/Activity/PaymentModal.js
index 20629a84..01cfed78 100644
--- a/app/components/Activity/PaymentModal.js
+++ b/app/components/Activity/PaymentModal.js
@@ -9,7 +9,6 @@ import { FaAngleDown } from 'react-icons/lib/fa'
 import Isvg from 'react-inlinesvg'
 import paperPlane from 'icons/paper_plane.svg'
 import zap from 'icons/zap.svg'
-import { blockExplorer } from 'utils'
 
 import Value from 'components/Value'
 
@@ -62,7 +61,7 @@ const PaymentModal = ({
       </section>
 
     </div>
-    
+
     <div className={styles.date}>
       <Moment format='LLL'>{payment.creation_date * 1000}</Moment>
     </div>
diff --git a/app/components/Activity/TransactionModal.js b/app/components/Activity/TransactionModal.js
index 30decb8f..072857fe 100644
--- a/app/components/Activity/TransactionModal.js
+++ b/app/components/Activity/TransactionModal.js
@@ -69,7 +69,7 @@ const TransactionModal = ({
       </section>
 
     </div>
-    
+
     <div className={styles.date}>
       <Moment format='LLL'>{transaction.time_stamp * 1000}</Moment>
     </div>
diff --git a/app/components/Wallet/Wallet.js b/app/components/Wallet/Wallet.js
index b3ae5052..a555ebe0 100644
--- a/app/components/Wallet/Wallet.js
+++ b/app/components/Wallet/Wallet.js
@@ -97,7 +97,9 @@ Wallet.propTypes = {
   currentTicker: PropTypes.object.isRequired,
   openPayForm: PropTypes.func.isRequired,
   openRequestForm: PropTypes.func.isRequired,
-  openReceiveModal: PropTypes.func.isRequired
+  openReceiveModal: PropTypes.func.isRequired,
+  showPayLoadingScreen: PropTypes.bool.isRequired,
+  showSuccessPayScreen: PropTypes.bool.isRequired
 }
 
 export default Wallet
diff --git a/app/reducers/payment.js b/app/reducers/payment.js
index 3365c369..e73e2be9 100644
--- a/app/reducers/payment.js
+++ b/app/reducers/payment.js
@@ -3,7 +3,6 @@ import { ipcRenderer } from 'electron'
 import { fetchBalance } from './balance'
 import { setFormType } from './form'
 import { resetPayForm } from './payform'
-import { showModal } from './modal'
 import { setError } from './error'
 
 // ------------------------------------
@@ -96,7 +95,7 @@ export const paymentFailed = (event, { error }) => (dispatch) => {
   dispatch(setError(error))
 }
 
-export const payInvoice = paymentRequest => (dispatch, getState) => {
+export const payInvoice = paymentRequest => (dispatch) => {
   dispatch(sendPayment())
   ipcRenderer.send('lnd', { msg: 'sendPayment', data: { paymentRequest } })
 
@@ -120,12 +119,12 @@ export const payInvoice = paymentRequest => (dispatch, getState) => {
 const ACTION_HANDLERS = {
   [GET_PAYMENTS]: state => ({ ...state, paymentLoading: true }),
   [RECEIVE_PAYMENTS]: (state, { payments }) => ({ ...state, paymentLoading: false, payments }),
-  
+
   [SET_PAYMENT]: (state, { payment }) => ({ ...state, payment }),
   [SEND_PAYMENT]: state => ({ ...state, sendingPayment: true }),
   [PAYMENT_SUCCESSFULL]: state => ({ ...state, sendingPayment: false }),
   [PAYMENT_FAILED]: state => ({ ...state, sendingPayment: false }),
-  
+
   [SHOW_SUCCESS_SCREEN]: state => ({ ...state, showSuccessPayScreen: true }),
   [HIDE_SUCCESS_SCREEN]: state => ({ ...state, showSuccessPayScreen: false })
 }
diff --git a/app/routes/activity/components/Activity.js b/app/routes/activity/components/Activity.js
index 6fd50fcd..7ea8b984 100644
--- a/app/routes/activity/components/Activity.js
+++ b/app/routes/activity/components/Activity.js
@@ -42,9 +42,7 @@ class Activity extends Component {
 
   render() {
     const {
-      invoice: { invoiceLoading },
       balance,
-      payment: { paymentLoading },
       activity: {
         filters,
         filter,
@@ -56,8 +54,6 @@ class Activity extends Component {
       walletProps
     } = this.props
 
-    // if (invoiceLoading || paymentLoading) { return <LoadingBolt /> }
-    // if (balance.balanceLoading) { return <LoadingBolt /> }
     if (!balance.channelBalance || !balance.walletBalance) { return <LoadingBolt /> }
 
     return (
@@ -102,8 +98,6 @@ Activity.propTypes = {
   fetchBalance: PropTypes.func.isRequired,
 
   ticker: PropTypes.object.isRequired,
-  invoice: PropTypes.object.isRequired,
-  payment: PropTypes.object.isRequired,
   currentTicker: PropTypes.object.isRequired,
 
   showActivityModal: PropTypes.func.isRequired,