From 0ebe9ea43f72cb784f3cd526c8dd25bc24d598b8 Mon Sep 17 00:00:00 2001 From: Jack Mallers Date: Fri, 26 Jan 2018 15:01:15 -0600 Subject: [PATCH 1/2] fix(release): prep for release --- app/components/LndSyncing/LndSyncing.js | 20 +------------------- app/reducers/activity.js | 2 +- app/routes/activity/components/Activity.js | 2 ++ 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/app/components/LndSyncing/LndSyncing.js b/app/components/LndSyncing/LndSyncing.js index 67d487c5..a834e1b6 100644 --- a/app/components/LndSyncing/LndSyncing.js +++ b/app/components/LndSyncing/LndSyncing.js @@ -2,7 +2,6 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import copy from 'copy-to-clipboard' import { showNotification } from 'notifications' -import { FaCopy } from 'react-icons/lib/fa' import styles from './LndSyncing.scss' @@ -36,26 +35,11 @@ class LndSyncing extends Component { this.props.fetchBlockHeight() } - componentDidUpdate(prevProps) { - const { grpcStarted, newAddress } = this.props - - if (!prevProps.grpcStarted && grpcStarted) { - newAddress('np2wkh') - } - } - render() { - const { syncPercentage, address: { addressLoading, address } } = this.props + const { syncPercentage } = this.props const { facts, currentFact } = this.state const renderCurrentFact = facts[currentFact] - const copyOnClick = () => { - if (!address || !address.length) { return } - - copy(address) - showNotification('Noice', 'Successfully copied to clipboard') - } - return (
@@ -91,13 +75,11 @@ class LndSyncing extends Component { } LndSyncing.propTypes = { - newAddress: PropTypes.func.isRequired, fetchBlockHeight: PropTypes.func.isRequired, syncPercentage: PropTypes.oneOfType([ PropTypes.number, PropTypes.string ]).isRequired, - address: PropTypes.object.isRequired, grpcStarted: PropTypes.bool.isRequired } diff --git a/app/reducers/activity.js b/app/reducers/activity.js index f8db7870..e9b672ae 100644 --- a/app/reducers/activity.js +++ b/app/reducers/activity.js @@ -101,7 +101,7 @@ const allActivity = createSelector( const searchedArr = [...payments, ...invoices, ...transactions].filter((tx) => { if ((tx.tx_hash && tx.tx_hash.includes(searchText)) || (tx.payment_hash && tx.payment_hash.includes(searchText)) || - (tx.r_hash && tx.r_hash.includes(searchText))) { + (tx.payment_request && tx.payment_request.includes(searchText))) { return true } diff --git a/app/routes/activity/components/Activity.js b/app/routes/activity/components/Activity.js index 60c83d5d..d20019b2 100644 --- a/app/routes/activity/components/Activity.js +++ b/app/routes/activity/components/Activity.js @@ -67,6 +67,8 @@ class Activity extends Component { if (balance.balanceLoading) { return } if (!balance.channelBalance || !balance.walletBalance) { return } + console.log('currentActivity: ', currentActivity) + return (
Date: Fri, 26 Jan 2018 15:13:02 -0600 Subject: [PATCH 2/2] remove console.log --- app/routes/activity/components/Activity.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/routes/activity/components/Activity.js b/app/routes/activity/components/Activity.js index d20019b2..60c83d5d 100644 --- a/app/routes/activity/components/Activity.js +++ b/app/routes/activity/components/Activity.js @@ -67,8 +67,6 @@ class Activity extends Component { if (balance.balanceLoading) { return } if (!balance.channelBalance || !balance.walletBalance) { return } - console.log('currentActivity: ', currentActivity) - return (