From cb470ad97032c8392aa0eb419490c12976c05658 Mon Sep 17 00:00:00 2001 From: Jeffrey Fisher Date: Thu, 23 Apr 2020 09:44:18 -0700 Subject: [PATCH] Do not double confirm on supports, per code review --- ui/component/walletSendTip/index.js | 9 ++++++++- ui/component/walletSendTip/view.jsx | 11 ++++++++--- ui/modal/modalSendTip/view.jsx | 10 +--------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ui/component/walletSendTip/index.js b/ui/component/walletSendTip/index.js index 97a880c44..feff1aa0b 100644 --- a/ui/component/walletSendTip/index.js +++ b/ui/component/walletSendTip/index.js @@ -1,5 +1,11 @@ import { connect } from 'react-redux'; -import { makeSelectTitleForUri, makeSelectClaimForUri, selectIsSendingSupport, selectBalance } from 'lbry-redux'; +import { + doSendTip, + makeSelectTitleForUri, + makeSelectClaimForUri, + selectIsSendingSupport, + selectBalance, +} from 'lbry-redux'; import WalletSendTip from './view'; import { doOpenModal } from 'redux/actions/app'; import { withRouter } from 'react-router'; @@ -13,6 +19,7 @@ const select = (state, props) => ({ const perform = dispatch => ({ openModal: (modal, props) => dispatch(doOpenModal(modal, props)), + sendSupport: (amount, claimId, isSupport) => dispatch(doSendTip(amount, claimId, isSupport)), }); export default withRouter(connect(select, perform)(WalletSendTip)); diff --git a/ui/component/walletSendTip/view.jsx b/ui/component/walletSendTip/view.jsx index 90716a479..4a4fdb3bf 100644 --- a/ui/component/walletSendTip/view.jsx +++ b/ui/component/walletSendTip/view.jsx @@ -30,10 +30,15 @@ function WalletSendTip(props: Props) { const isMobile = useIsMobile(); function handleSubmit() { - const { openModal } = props; + const { openModal, sendSupport } = props; + if (tipAmount && claimId) { - const modalProps = { tipAmount, claimId, title, isSupport }; - openModal(MODALS.CONFIRM_SEND_TIP, modalProps); + if (isSupport) { + sendSupport(tipAmount, claimId, isSupport); + } else { + const modalProps = { tipAmount, claimId, title, isSupport }; + openModal(MODALS.CONFIRM_SEND_TIP, modalProps); + } } } diff --git a/ui/modal/modalSendTip/view.jsx b/ui/modal/modalSendTip/view.jsx index 7137cca9b..a41759541 100644 --- a/ui/modal/modalSendTip/view.jsx +++ b/ui/modal/modalSendTip/view.jsx @@ -33,15 +33,7 @@ class ModalSendTip extends React.PureComponent { ) } - actions={ - - } + actions={} /> );